Hopefully added users controller etc.
Merge branch 'master' of github.com:paullainchbury/cheerups