Merge pull request #17 from lefnire/develop

Update my Develop
Bacon Bacon

Putting some bacon into the tavern NPC graphic. The people demand bacon.
Merge pull request #989 from Shaners/develop

Bacon Bacon