Jump now Kicks
fix longsword bbox
fix battleaxe bbox
add upstairs in blacksmith
merge master
change the random pillar wall to the right
Merge branch 'master' of git://github.com/hawkthorne/hawkthorne-journey into jump-kick
Merge branch 'master' into upstairs
Merge branch 'master' into longsword
Merge pull request #1353 from didory123/longsword

fix longsword bbox
Merge pull request #1360 from didory123/upstairs

Add upstairs in blacksmith
Merge pull request #1332 from DaNiwa/jump-kick

Default Jump now Kicks Instead of Nothing