go go go
Merge branch 'master' of https://github.com/vincerp/KinectUnityProject

Conflicts:
	Assets/Abilities/JetpackPowerUp.asset
	Assets/Abilities/JumpPowerUp.asset