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

Conflicts:
	Recovered/player and three scenes/player and three scenes-csharp.sln
	Recovered/player and three scenes/player and three scenes.sln