UI : Enemy Icon Switching

Icon switches based on collide.gameobject.name. added EnemyImage.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scene files/level1.unity
	CAPSTN2-Blood-Exile-csharp.sln
	CAPSTN2-Blood-Exile.sln
	CAPSTN2-Blood-Exile.userprefs
	Library/CurrentLayout.dwlt
	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/75/7591abc02a8409849b80c81aa588ed29
	Library/shadercompiler-1.log