iskarki
Merge remote-tracking branch 'origin/master'

Conflicts:
	Space Madness/Assets/Done/Done_Prefabs/Done_Bolt.prefab
	Space Madness/Assets/Done/Done_Scenes/Done_Main.unity
	Space Madness/Assets/Effects/New
Effects/BlackHole/ParticleMaterials/Lights/thickFlashAdd.mat
	Space Madness/Assets/Effects/New Effects/EnemyBoltEplosion/Effects/red
sparkl.prefab
	Space Madness/Assets/Effects/New
Effects/FireExplosion/Effects/EnemyShipExplosion.prefab
	Space Madness/Library/CurrentLayout.dwlt
	Space Madness/Library/assetDatabase3
	Space Madness/Library/expandedItems
	Space Madness/Library/metadata/9d/9de2c40d96cd72b4cb2e4b817c8cf6a1
	Space Madness/Library/metadata/e3/e3563bf1369822146adfcb2fa11121aa
	Space Madness/Library/metadata/f9/f9434c0e7640d264d8ede296b65ba0c5
	Space Madness/Library/shadercompiler-1.log