201407171448
Merge branch 'master' of github.com:suburbanplankton/rpg

Conflicts:
	stuff/Char.attributes.primary
	stuff/mkchar.attributes.primary.sh
	stuff/mkchar.attributes.secondary.sh
	stuff/mkchar.sh
	stuff/vsizes.cpp
	stuff/vsizes.exe