fixed newline bug
added qt debug stuff
Merge branch 'master' of https://github.com/bensechrist/civ-simulator

blah blah blah