Hide Mac OS files from repository
Merge branch 'master' of https://github.com/bennyn/secret-happiness