Merge pull request #56 from ryanhburbank/bb

fix question and answer issues
Merge pull request #57 from ryanhburbank/master

Merge pull request #56 from ryanhburbank/bb