Final commit for project 3
Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages