Temporary HUD
Merge branch 'master' of github.com:ElectrikSheep/E_Project

Conflicts:
	Game/Game-csharp.sln
	Game/Game.sln
	Game/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Game/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Game/Library/ScriptAssemblies/Assembly-CSharp.dll
	Game/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Game/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Game/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Game/Library/assetDatabase3
	Game/Library/guidmapper
	Game/Temp/PVRT-Feed.png
	Game/Temp/PVRT.pvr
	Game/Temp/UnityTempFile-00f64f10c0b1c41c49ac403ca6425e88
	Game/Temp/UnityTempFile-03a06ff525d32445d9685a5a63df7c19
	Game/Temp/UnityTempFile-0440f9d2ac9ac49f4874f83dcafefdc7
	Game/Temp/UnityTempFile-0a81aa45df696440b9e842d7e0f96009
	Game/Temp/UnityTempFile-0f5aefef1cd784a5abaa711a3ce3c3f0
	Game/Temp/UnityTempFile-233df92496e54490a837e06a94fb117e
	Game/Temp/UnityTempFile-3ab3ef22948c14affbfe7c9ee12e30ed
	Game/Temp/UnityTempFile-7f71910f9425c4f0cbff1c65aff15b47
	Game/Temp/UnityTempFile-8a280a6371d1540f382d5982fa6cdcd3
	Game/Temp/UnityTempFile-a0af54f7c89f24e3392a6ffc9307a803
	Game/Temp/__EditModeScene
Fixed character scale and added temp enemy.
New Models