not quite successful integration of character and weapon (commented out at the moment)
merging weapon/character conflicts
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages
removed a completed todo comment