started working on finalchase
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/NPCs/ActionActor.cs
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/Data/GameConstants.cs
.
Merge branch 'master' of https://github.com/annsimon/candyland
scenetest2 updated
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/Data/GameConstants.cs