Made boss amazing
Merge branch 'master' of https://github.com/chrissilich/CircusGameDev2014Q3TeamSonic

Conflicts:
	game/Assets/Scenes/descent-7.unity
	game/game-csharp.sln
	game/game.sln