Merge branch 'dev' of https://github.com/stoci/rpg
Merge branch 'master' of https://github.com/stoci/rpg
readded titles to text output
Merge branch 'dev'