added a tilemap and loads it in
Merge remote-tracking branch 'origin/master'