Merge pull request #55 from codecademy-beginners/gh-pages

merge with master