This should be the final one.
Merge branch 'master' of https://github.com/USIGroupZ/CookieCrumbles