changed from base.tmx to level1.tmx
 added the creepy files
fixed merge conflicts
fixed base.tmx