Resolved some bugs !
Merge branch 'master' of https://github.com/schobbent/Pulkse
Merge branch 'master' of https://github.com/schobbent/Pulkse

Conflicts:
	Assets/Materials/GreenBall.mat
	Assets/Musique/ggj.meta
	Assets/Musique/ggj/beatitude1.mp3.meta
	Assets/Musique/ggj/beatitude2.mp3.meta
	Assets/Musique/ggj/beatitude3.mp3.meta
	Assets/Musique/ggj/beatitude4.mp3.meta
	Assets/Musique/ggj/colere1.mp3.meta
	Assets/Musique/ggj/colere2.mp3.meta
	Assets/Musique/ggj/colere3.mp3.meta
	Assets/Musique/ggj/colere4.mp3.meta
	Assets/Musique/ggj/joie1.mp3.meta
	Assets/Musique/ggj/joie2.mp3.meta
	Assets/Musique/ggj/joie3.mp3.meta
	Assets/Musique/ggj/joie4.mp3.meta
	Assets/Musique/ggj/peur1.mp3.meta
	Assets/anims.meta
	Assets/anims/GGJ.meta
	Assets/anims/GGJ/flotte.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00003.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00004.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00005.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00006.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00007.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00008.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00009.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00010.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00011.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00012.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00013.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00014.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00015.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00016.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00017.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00018.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00019.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00020.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00021.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00022.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00023.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00024.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00025.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00026.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00027.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00028.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00029.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00030.png.meta
	Assets/anims/GGJ/flotte/ggj-flotte_00031.png.meta