centrage
Merge branch 'master' of https://github.com/Qonic/thundermafia

Conflicts:
	Assembly-CSharp-firstpass.pidb
	Assembly-CSharp.pidb
	Assembly-UnityScript-firstpass.pidb
	Assembly-UnityScript.pidb
	Assets/Bullet.prefab
	Assets/Materials/anneau.mat
	Assets/resources/Ring.prefab
	ProjectSettings/TagManager.asset
	thundermafia.userprefs