first and probably only commit
Merge branch 'master' of https://github.com/sheley/cookie-monster