Merge pull request #15 from RocketSurgery/jump_controls

Jump controls
Hair, skates, pattern helper, models
Merge branch 'master' of https://github.com/RocketSurgery/DDRGame

Conflicts:
	Assets/Prefabs/Player/Player.prefab
	Assets/Scripts/OfficeRoom.cs
	Assets/Scripts/Pattern.cs
Adding .orig
Merge remote-tracking branch 'origin/master' into jump_controls