First Commit
minor fixes
change media queries
Merge branch 'master' into gh-pages