reseed the db with proper question/answer
log merge conflict fixed
Merge pull request #135 from plondon/master

reseed the db with proper question/answer