part 1 finished
Merge branch 'master' of https://github.com/lidise7en/CookieCrush