1/4SatureAI
Merge branch 'master' of https://github.com/davll/GameProgramming

Conflicts:
	UnityProject/Assets/L_FG_Assets_Pack_Lite/Demo/Demo6.unity
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/InspectorExpandedItems.asset
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	UnityProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	UnityProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	UnityProject/Library/assetDatabase3
	UnityProject/Library/guidmapper
	UnityProject/Library/metadata/86/86c591ebd74142c4d93243d9fa9544da
	UnityProject/Library/metadata/cf/cf1ecd0b49db547c4b565a629c69a256
	UnityProject/ProjectSettings/TagManager.asset
Merge branch 'master' of https://github.com/davll/GameProgramming

Conflicts:
	UnityProject/Assets/ActorWeaponHit.cs
	UnityProject/Assets/L_FG_Assets_Pack_Lite/Demo/Demo6.unity
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/InspectorExpandedItems.asset
	UnityProject/Library/expandedItems
	UnityProject/Library/guidmapper