fixing conflict on merge

diff --cc .gitignore
index 1aa3d45abfa7f35d7fc9758d5b09d833d0f02b8a,1aa3d45abfa7f35d7fc9758d5b09d833d0f02b8a..bfd77de80857ae37038578f11c9009bf511d764d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
  .sass-cache/*
++.DS_Store

diff --cc sass/app.scss
Simple merge

diff --cc stylesheets/app.css
index 11e27151f631501626386763e88ff853b40ba963,29cfb3f04e46064472ea68ab922ebdbe142bab80..1bce0112a796e63b1778e2235e95a45a64babd63
--- 1/stylesheets/app.css
--- 2/stylesheets/app.css
+++ b/stylesheets/app.css
@@@ -12791,9 -12745,9 +12793,9 @@@ ul.mobile-nav a.current 
    margin: 5px 10px;
    float: right;
  }
 -/* line 586, ../sass/app.scss */
 +/* line 603, ../sass/app.scss */
  #previewModal iframe {
-   margin-top: 40px;
+   margin-top: 47px;
    border: none;
    width: 100%;
    height: 100%;