Merge pull request #1 from 320ny/gh-pages

Changes from gh-pages branch
Update style.scss
Merge pull request #2 from 320ny/master

Master