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

Conflicts:
	Projet_Unity/Assembly-Boo-Editor-vs.booproj
	Projet_Unity/Assembly-Boo-Editor.booproj
	Projet_Unity/Assembly-CSharp-Editor-vs.csproj
	Projet_Unity/Assembly-CSharp-Editor.csproj
	Projet_Unity/Assembly-UnityScript-Editor-vs.unityproj
	Projet_Unity/Assembly-UnityScript-Editor.unityproj
	Projet_Unity/Library/assetDatabase3
	Projet_Unity/Library/expandedItems
	Projet_Unity/Library/guidmapper
	Projet_Unity/Projet_Unity-csharp.sln
	Projet_Unity/Projet_Unity.sln
-jolain