test1
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into dev_1.0
Add Common Interface File for macros
Merge branch 'cm-4' into dev_1.0

Conflicts:
	CandyMadness/CandyMadness/CandyMadness-Prefix.pch
Merge pull request #1 from karencatearabit/cm-4

merge cm-4 to dev_1.0
Added timer function
Modified some assets
Modified some of the magic numbers