Completed assignment
Merge branch 'gh-pages'

Completed assigment.