Merging branch
Merge branch 'master' of https://github.com/ripark87/2DFantasyGame

Conflicts:
	Assets/Scripts/HeroMovement.cs