writing db setup
Adding questions
writing db setup
Adding questions
Merge branch 'master' of https://github.com/RTakes/COPPER-BOBCAT
Merge pull request #78 from RTakes/master

Adding questions to db
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
Merge pull request #80 from COPPER-BOBCAT/staging

Merge conflict resolution