Too big commit
Some work on hero
Added hero prefab
Stuff in manager to do test_martin
It seemed important
Project setting I guessssss
Library stuff, MUST BE DELETED I think
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14

Conflicts:
	AEMI_GameJam_H14-csharp.sln
	AEMI_GameJam_H14.sln
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scripts/Managers/SceneManager.cs
	Library/AssetServerCacheV3
	Library/CurrentLayout.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/09/099a174b42c58476294b4a353ec0cf39
	Library/metadata/14/14f956c51d4fb43b795fe227e8c62bb4
	Library/metadata/35/357c747c01ad44cd38430671200136cb
	Library/metadata/3e/3e6a729f53b5c4ad6ac03191ec0dbf38
	Library/metadata/4e/4efb3313579a64fecbf7833cd4439a22
	Library/metadata/56/5632a7b4dd6ef42c281c41b5c7a42582
	Library/metadata/84/841b7d616fb394869a55183bda8a7a9d
	Library/metadata/95/95dcee4ff0d3144c093a645e05049767
	Library/metadata/a2/a26d6367bb2c74854a4591da1e26d697
	Library/metadata/a7/a76eff8da7ead451eb4778214c2fc5af
	Library/metadata/cc/cce854985caa14f6d9c81ef0c830c96b