added app.config
Merge branch 'master' of https://github.com/annsimon/candyland
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/app.config
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/app.config
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/app.config
collision detection now works when changing area as well