Decreased the bounding box for intersection
Add Common Interface File for macros
Added Game Over Popup
(pending code to reset the game)
Random placement of candies on the screen
Merge branch 'cm-4' into dev_1.0

Conflicts:
	CandyMadness/CandyMadness/CandyMadness-Prefix.pch
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into cm-7
Added collision of candies (different)
Added collision of candies (similar) - not yet final
Fixed collision with similar  candies
Added assets (candy#1, candy#2, candy#3, game screen background, shooter)
Added animation of next candy to be shot
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
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into cm-7

Conflicts:
	CandyMadness/CandyMadness/Controller/CMGameViewController.h
	CandyMadness/CandyMadness/Controller/CMGameViewController.xib
Added new files
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
Modified the candy.png
Added pause function
Added the increase number of candies (going down) - not yet final
Added saving function
Modified the background for the pause screen
Merge branch 'cm-4' into dev_1.0

Conflicts:
	CandyMadness/CandyMadness/Model/Candy.m
	CandyMadness/CandyMadness/Resources/Images/candy.png
Added Game Over Popup
Added scoring function (no label yet)
Merge pull request #3 from karencatearabit/dev_1.0

merge dev_1.0 to cm-4
Added SegoeWP font for the scores
Applied the scoring to the labels