kyleconroy/hawkthorne-journey — pull request #261 by jhoff (2012-09-12 03:08:21+00:00)
Title: Wall upgrades

Merging this should resolve the merge conflict with the black cavern pull request