first commit
Merge branch 'master' of https://github.com/minac/secret-happiness

because I had something in the github readme that was different from the local readme
my second commit