marc-antoine
marc-antoine
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe2

Conflicts:
	Projet_Unity/Library/assetDatabase3
	Projet_Unity/Library/expandedItems
	Projet_Unity/Library/guidmapper
	Projet_Unity/Projet_Unity-csharp.sln
	Projet_Unity/Projet_Unity.sln
marc-antoine