Fixed hw
Solutions done
simplify
Merge branch 'master' into gh-pages