Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Player/Graphics/PlayerAnimator.controller
	Assets/Scenes/Game.unity

Das Jumpen 2.0
Merge branch 'master' of https://github.com/Sense-of-Right-Alliance/OrcaJam2014

Conflicts:
	Assets/Player/Graphics/PlayerAnimator.controller
	Assets/Scenes/Game.unity
Lots of stuff