hot n cold with feed back and validation
Merge branch 'master' into gh-pages