Added enemy spawner
Merged stuff