new screens
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/Game1.cs
Merge branch 'master' of https://github.com/annsimon/candyland
theWorld.xml will be versioned now
Merge branch 'master' of https://github.com/annsimon/candyland