suspenders 1.4
Merge branch 'master' of github.com:icco/dungeontracker

Conflicts:
	.gitignore
	README.md
bin stubs