change how enemies are spawned
Merge remote-tracking branch 'upstream/master'