Jump
Merge branch 'master' of https://github.com/zrrz/EverWinter

Conflicts:
	Assets/Bottom Half.controller