Initial Commit
Finished Assignment

Submitting finished assignment.
Merge branch 'master' into gh-pages