added entrances to the tileMapEditor
merging develop with collision
fixing merge with collision
continuing to fix merge
fixed bug with entrance map
merged collision and added dungeon project