changes don't worry about this one
Merge branch 'master' of https://github.com/chrissilich/CircusGameDev2014Q3TeamDK

Conflicts:
	game-ignorForNow/Assets/scenes/scene1.unity
	game-ignorForNow/Assets/scripts/characterAnimation.js
idk what this is