Wave cleanup and also working now
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Prefabs/Enemies/SingleShotEnemy.prefab
	Assets/Scenes/default.unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Prefabs/Enemies/SingleShotEnemy.prefab
	Assets/Scenes/default.unity