Everything Tom has done so far
Merge branch 'master' of github.com:paullainchbury/cheerups