Merge pull request #6 from Widdershin/combat

Combat
loaded rooms with directions
merged master into room_setup
Merge pull request #8 from Widdershin/room_setup

loaded rooms with directions
Merged master in movement