Merge pull request #115 from SecretWizard/patch-33

Fixing math and trying to get Martial Training to work

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25307 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Merge pull request #116 from mjmeans/pfs

ACG Skald work

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25308 ef53c05b-3124-4d59-ae7d-fe3273f42be7