Written plan for day
Comitting solution
Merge branch 'master' into gh-pages