Created enemies and added to correct rooms
Merge branch 'master' into Geoffs_WIP