Orc battle at entrance of cave. Player now has hit_points.
Removed additional player_life attribute from n3 tile. It's been moved to Player class.
Support for attack words.
leave method returns True if they manage to flee
Else condition for reporting health is now a catch-all (in case they go into negative hit points).
Fixed leave condition at cave entrance.
Merge pull request #4 from ben174/master

Add new n3 tile with Orc battle at entrance of cave. Player now has hit_points.
Allow custom message when player attempts to move to nonexistent tile.

Closes gh-7
Merge remote-tracking branch 'upstream/master' into southern-tiles-1
Now player can eat berries to recover 2 hit point in tile n3.
Merge pull request #8 from kkpattern/eat_berries

Now player can eat berries to recover 2 hit point in tile n3.
Merge remote-tracking branch 'upstream/master' into southern-tiles-1
New framework to allow combining items.
Document combining items
Merge pull request #11 from takluyver/items-framework

Items framework
Changed action.get_action to handle prepositions differently
Merge pull request #13 from SmartViking/master

Changed action.get_action
Merge branch 'master' of git://github.com/takluyver/weatbag into southern-tiles-1
Getting everything up to date before I continue. Also see if anyone has added cool new features.
Finished s3 encounter w/ short man