submit solution for the project
minor changes, fix some formatting mistakes
Merge branch 'master' into gh-pages