JUMP BIATCH
Merge branch 'master' of https://github.com/KerDelos/LD31

Conflicts:
	Assets/Textures/anims/pasbeau_marche.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0001.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0002.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0003.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0004.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0005.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0006.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0007.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0008.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0009.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0010.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0011.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0012.png.meta
	Assets/Textures/anims/pasbeau_marche/anim_march_gros0013.png.meta
	Assets/Textures/diamant.png.meta
zefzemfhzef
Merge branch 'master' of https://github.com/KerDelos/LD31