Final project
Merge branch 'master' of https://github.com/Katasa/ProjectTraining2-3

Conflicts:
	ProjectTraining2&3/Assets/Prefabs/EnnemyDistant.prefab
	ProjectTraining2&3/Assets/Scripts/EnemyBullet.cs
	ProjectTraining2&3/Library/AssetServerCacheV3
	ProjectTraining2&3/Library/CurrentLayout.dwlt
	ProjectTraining2&3/Library/CurrentMaximizeLayout.dwlt
	ProjectTraining2&3/Library/InspectorExpandedItems.asset
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectTraining2&3/Library/assetDatabase3
	ProjectTraining2&3/Library/expandedItems
	ProjectTraining2&3/Library/guidmapper
	ProjectTraining2&3/Library/metadata/45/45fd0e60bc7f6894093dd2d09c71186b
	ProjectTraining2&3/Library/metadata/6f/6f235b82ceeeda7478875e9b949b978c
	ProjectTraining2&3/ProjectTraining2&3-csharp.sln
	ProjectTraining2&3/ProjectTraining2&3.sln
	ProjectTraining2&3/ProjectTraining2&3.userprefs