first commit
Merge branch 'master' of https://github.com/mvergeer/trial-of-happiness