changement vitesse vaisseau
Merge branch 'master' of https://github.com/BabacarPlusPlus/TER-2014

Conflicts:
	Assets/Scene/Jeu.unity
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00db858c1f8ff90478dad0aa1bac9a2c
	Library/metadata/29/2958dbdaa30503947a0b77f3aa6f73ca
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/5c/5c09bc1d34d2e554390b892ca821128a
	Library/metadata/6e/6e73d369efc37ea48baa129b7c36cba6
	Library/metadata/9f/9fe64c8b29fca534ca655480e8101792
	Library/metadata/b1/b1b5425f3a3b11e4bb2028a8cfbc96ef
	Library/metadata/b3/b3b1814c274dfa94eb05ee246c4238b2
	Library/metadata/c5/c5b1f5e3e689774458a9508ccf01f818
	Library/metadata/e7/e7cbfbdaa35c7a84c8e1ec4a49a00a41
	Library/metadata/fc/fc63c78e45d575a4c89d7d17102a2d91
	TER-2014-csharp.sln
	TER-2014.sln