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

Conflicts:
	Projet_Unity/Library/InspectorExpandedItems.asset
	Projet_Unity/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Projet_Unity/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Projet_Unity/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Projet_Unity/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Projet_Unity/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Projet_Unity/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Projet_Unity/Library/assetDatabase3
	Projet_Unity/Library/expandedItems
	Projet_Unity/Library/guidmapper
	Projet_Unity/Projet_Unity-csharp.sln
	Projet_Unity/Projet_Unity.sln
	Projet_Unity/Temp/3dsMax.log
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe2
marc-antoine