resolves #5
Merge branch 'master' of https://github.com/fwhiffahder/civcraftsite