Merge pull request #7 from codecademy-beginners/master

master to gh-pages
Merge pull request #8 from codecademy-beginners/gh-pages

Merge pull request #7 from codecademy-beginners/master