combined the dungeon and lady java projects
implemented new collision detection