fuck github criss
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-CSharp-firstpass-vs.csproj
	Projet_Unity/Assembly-CSharp-firstpass.csproj
	Projet_Unity/Assembly-UnityScript-Editor-vs.unityproj
	Projet_Unity/Assembly-UnityScript-Editor.unityproj
	Projet_Unity/Assembly-UnityScript-firstpass-vs.unityproj
	Projet_Unity/Assembly-UnityScript-firstpass.unityproj
	Projet_Unity/Assembly-UnityScript-vs.unityproj
	Projet_Unity/Assembly-UnityScript.unityproj
	Projet_Unity/Library/AssetServerCacheV3
	Projet_Unity/Library/assetDatabase3
	Projet_Unity/Library/expandedItems
	Projet_Unity/Library/guidmapper
	Projet_Unity/Library/metadata/31/3186f38ca67e7441e8299da2e169f9f9
	Projet_Unity/Library/metadata/56/56a281aaa74f30f489ba650391ddc0e3
	Projet_Unity/Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
	Projet_Unity/Library/metadata/e5/e5bdb6135a74b444d8cebd065dbf9d08
	Projet_Unity/Projet_Unity-csharp.sln
	Projet_Unity/Projet_Unity.sln
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe2

Conflicts:
	Projet_Unity/Library/metadata/31/3186f38ca67e7441e8299da2e169f9f9
	Projet_Unity/Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
	Projet_Unity/Library/metadata/e5/e5bdb6135a74b444d8cebd065dbf9d08