.
Merge branch 'master' of https://github.com/chrissilich/CircusGameDev2014Q3TeamSamus

Conflicts:
	game/Assets/Scenes/Amanda.unity