Merge branch 'master' of https://github.com/mafiya69/MildHop

Conflicts:
	Assets/scripts/playerJump.cs
project refactored by mafiya