add upstairs in blacksmith
merge master
change the random pillar wall to the right
Merge branch 'master' into upstairs
Merge pull request #1360 from didory123/upstairs

Add upstairs in blacksmith