Jump semi working
Change setting
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14

Conflicts:
	Assets/Meshes.meta
	Assets/Meshes/Materials.meta
	Assets/Meshes/Materials/Dwark_D.mat
	Assets/Meshes/Materials/Dwark_D.mat.meta
	Assets/Meshes/dwarf1.FBX.meta
	Assets/Textures.meta
	Assets/Textures/Dwark_D.png.meta
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14