Database setup and routes added
choices and questions views added
master branch pulled
small edits
Merge pull request #2 from JasonMannon/user_choices

User choices