fixed merge conflicts

diff --cc scss/foundation.scss
index cae8c10beabcdcadf62f8457a22e36ae48a865a9,f51265056739cb18d68bc9826f109cd4d7836a15..624656f6979e7664f191ce474841556a943c0f27
--- 1/scss/foundation.scss
--- 2/scss/foundation.scss
+++ b/scss/foundation.scss
@@@ -16,96 -16,6 +16,4 @@@
    'components/thumbnail',
    'components/menu',
    'components/outlook-first',
--  'components/media-query';
- 
- //my overrides
- .header {
-   background: #999999;
- }
- 
- .sub-header {
-   text-align: right;
-   vertical-align: middle;
- }
- 
- table.facebook td {
-   background: #3b5998;
-   border-color: #2d4473;
- }
- 
- table.facebook:hover td {
-   background: #2d4473 !important;
- }
- 
- table.twitter td {
-   background: #00acee;
-   border-color: #0087bb;
- }
- 
- table.twitter:hover td {
-   background: #0087bb !important;
- }
- 
- table.google-plus td {
-   background-color: #DB4A39;
-   border-color: #CC0000;
- }
- 
- table.google-plus:hover td {
-   background: #CC0000 !important;
- }
- 
- .template-label {
-   color: #ffffff;
-   font-weight: bold;
-   font-size: 11px;
- }
- 
- .callout .wrapper {
-   padding-bottom: 20px !important;
- }
- 
- .callout .panel {
-   background: #ECF8FF;
-   border-color: #b9e5ff;
- }
- 
- .header {
-   background: #999999;
- }
- 
- .footer .wrapper {
-   background: #ebebeb;
- }
- 
- .footer h5 {
-   padding-bottom: 10px;
- }
- 
- table.columns .text-pad {
-   padding-left: 10px;
-   padding-right: 10px;
- }
- 
- table.columns .left-text-pad {
-   padding-left: 10px;
- }
- 
- table.columns .right-text-pad {
-   padding-right: 10px;
- }
- 
- @media only screen and (max-width: 600px) {
- 
-   table[class="body"] .right-text-pad {
-     padding-left: 10px !important;
-   }
--
-   table[class="body"] .left-text-pad {
-     padding-right: 10px !important;
-   }
- }
--
- .my-class {
-   background: red;
- }
++  'components/media-query';