Final version with Hotter and Colder tips
Merge branch 'master' into gh-pages