Commit pour Axel
Merge branch 'master' of https://github.com/lucaslg/Ludum-Dare-31

Conflicts:
	Prefab/Characters/PoliceGuy.prefab
	Prefab/Characters/RiotGuy.prefab
	Sprite/Characters/Thumbs.db.meta
	Sprite/Thumbs.db.meta