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 branch 'Robert' of https://github.com/brandr/RoguelikeRepo into Robert
please don't overwrite my stuff
please don't overwrite my stuff
heeeeeeeeeeeere we gooooooooooo