Added Game Over Popup
(pending code to reset the game)
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into cm-7
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
Merge branch 'cm-4' into dev_1.0

Conflicts:
	CandyMadness/CandyMadness/Model/Candy.m
	CandyMadness/CandyMadness/Resources/Images/candy.png
Added Game Over Popup
Merge pull request #3 from karencatearabit/dev_1.0

merge dev_1.0 to cm-4