JulyJam-csharp.v11.suo modified in unknown way
Merge branch 'master' into shipMovement

Conflicts:
	Assets/Assets/Art/Materials.meta
	Assets/shipCollision_testScene.unity.meta
	Assets/shipFiring_testScene.unity.meta
	Assets/shipMovement_testScene.unity.meta
	JulyJam-csharp.v11.suo