Added timer function
Modified some assets
Modified some of the magic numbers
Merge branch 'cm-4' of https://github.com/karencatearabit/tcgroupapp into dev_1.0

Conflicts:
	CandyMadness/CandyMadness.xcodeproj/project.pbxproj
	CandyMadness/CandyMadness/Controller/CMGameViewController.m
	CandyMadness/CandyMadness/Controller/CMGameViewController.xib
	CandyMadness/CandyMadness/Model/Candy.h