Merge pull request #3 from brandr/master

PLSS
Merge branch 'Robert', remote-tracking branch 'origin' into Robert
here goes I am pulling git ready (lol geddit xD)
Merge branch 'Robert' of http://github.com/brandr/RoguelikeRepo into Robert
here comes another pull
Merge http://github.com/brandr/RoguelikeRepo into Robert
Merge branch 'Robert' of https://github.com/brandr/RoguelikeRepo into Robert
please don't overwrite my stuff
please don't overwrite my stuff
Some delicious documentation-with the source included for you losers who need to export your own pdf
Merge branch 'Robert' of https://github.com/brandr/RoguelikeRepo into Robert
Some weapon brands!
Merge branch 'Robert' of http://github.com/brandr/RoguelikeRepo into Robert
Merge pull request #4 from brandr/Robert

Here you go robert, just like you asked. Thank you for requesting the pull nicely and being a good student.