Minor changes not worth mentioning

Minor changes not worth mentioning
Merge branch 'master' of https://github.com/decamonos/Mythonia_Epic

Conflicts:
	Mythonia Epic/Assets/Scripts/Attack.cs
	Mythonia Epic/Library/CurrentLayout.dwlt
	Mythonia Epic/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Mythonia Epic/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Mythonia Epic/Library/ScriptAssemblies/Assembly-CSharp.dll
	Mythonia Epic/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Mythonia Epic/Library/assetDatabase3
	Mythonia Epic/Library/metadata/77/77e51d8a39a7b9148a194019948c1ca6
	Mythonia Epic/Mythonia Epic.userprefs