Merge pull request #7 from codecademy-beginners/master

master to gh-pages