new directions
conflict fixes
added directions from your current location and where item is
Merge branch 'master' of https://github.com/tommaton/battlehack