Merge pull request #13 from RocketSurgery/jump_controls

Jump controls
Work on placeholder level
Fixing weird collision bug with going through doors.
Merge branch 'master' into placeholderLevel

Conflicts:
	Assets/Scenes/choreoTesting.unity
Merge remote-tracking branch 'origin/placeholderLevel' into jump_controls