First Commit

Ported from Code Academy
Merge branch 'gh-pages'