Merge pull request #1 from Sense-of-Right-Alliance/master

Big stuff
Merge pull request #5 from mike1072/master

earthquakes
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
Merge pull request #6 from NarPar/master

Merge pull request #1 from Sense-of-Right-Alliance/master
fixed everything (i hope)