Merge pull request #78 from RTakes/master

Adding questions to db
Merge pull request #79 from RTakes/master

Fixing merge conflicts
Merge pull request #80 from COPPER-BOBCAT/staging

Merge conflict resolution
fixing db merge issue