Merge pull request #10 from DavidGinzberg/gh-pages

Merge gh-pages back into master
Added the new exercise.
Merge pull request #11 from DavidGinzberg/master

New content