Most of spawning done, still need to implement dragon and stairs
Merged Charles and Mark's changes to grid