criss de github qui vaut pas dla marde
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe2

Conflicts:
	Projet_Unity/Assets/Terrain/defaultTerrain.asset
	Projet_Unity/Library/AssetServerCacheV3
	Projet_Unity/Library/InspectorExpandedItems.asset
	Projet_Unity/Library/assetDatabase3
	Projet_Unity/Library/expandedItems
	Projet_Unity/Library/guidmapper
	Projet_Unity/Library/metadata/56/56a281aaa74f30f489ba650391ddc0e3
	Projet_Unity/Projet_Unity-csharp.sln
	Projet_Unity/Projet_Unity.sln
low poly tank
-jolain