latest uploads found in game-shaw
Merge branch 'master' of https://github.com/chrissilich/CircusGameDev2014Q3TeamDK

Conflicts:
	game/Assets/scenes/scene1.unity