my last edit (for now)
Merge branch 'master' of https://github.com/halvors/CookieNow