sound design++
Merge branch 'master' of https://github.com/Khoyo/GGJ_2014

Conflicts:
	Assets/Code/CPlayer.cs
	Assets/Materials/Boss_Dos.mat
	Assets/Materials/Boss_Face.mat
	Assets/Prefabs/Medecin.prefab