Final version of project 2.
Making sure all final files are commited
Merge branch 'master' into gh-pages