second commit
Merge https://github.com/charlie-misscha/CandyCrusher
master