Added an enemy spawner
Fixed merge conflicts and things