player movement, shitty jumping
Merge branch 'master' of https://github.com/BlueRyth/tornadopocalypse

Conflicts:
	Assets/Scene/blank.unity
	Assets/Scripts/EnvironmentMovement.cs