you can go shopping now :)
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/CandylandContent/CandylandContent.contentproj