changed some values
Fixed merge conflict
Merge pull request #23 from NarPar/master

did not big stuff
Merge pull request #24 from leafdj/master

Bleep bloop random values
Merge branch 'master' of https://github.com/Sense-of-Right-Alliance/GGJ2014

Conflicts:
	Unity Project/Assets/Player/PlayerClass.cs

I love git, it works like _____.