Merge branch 'master' of https://github.com/stlck/Brimstone_Asteroid_test

Conflicts:
	Assets/Ships/Resources/LargeAsteroid.prefab
	Assets/Ships/Resources/MediumAsteroid.prefab
	Assets/Ships/Resources/SmallAsteroid.prefab
	Assets/start.unity
Merge branch 'master' of https://github.com/stlck/Brimstone_Asteroid_test