writing db setup
Adding questions
writing db setup
Adding questions
Routes conflict resolution
conflict res
Merge pull request #79 from RTakes/master

Fixing merge conflicts