affichage vie
Merge branch 'master' of https://github.com/BabacarPlusPlus/TER-2014

Conflicts:
	Assets/Scene/Jeu.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/c7/c7de5b9bbf95df24185e1807e650463c
	Library/metadata/e7/e7e5e6944974d5d429bbe879e6da2089
	TER-2014-csharp.sln
	TER-2014.sln
	TER-2014.userprefs