new models for player put into the solution
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/CandylandContent/CandylandContent.contentproj