.
solved merge conflicts... hopefully
Merge pull request #3 from conman246/another_connor_branch

Another connor branch
.
Made new branch called daniel2, included questions_to_ask txt file.
Added fake rewards intended for the end of survey
changed submit_survey to take_survey to improve naming convention and reduce confusion.
trying to get git working
added logout and navbar partials so the user can logout from any page as long as they are logged in
ERB for basic listing of questions and pos answers
ajaxified the create survey link on the user portal page
trying to merge
Merge pull request #5 from conman246/conman_branch

Conman branch.... fixed conflicts
Fixed seed algorithm, did stats page
Merge pull request #6 from conman246/danny2

Danny2
used ajax to successfully post new title but still need to display the information correctly.
fixed the logout button to stop rendering when ajax posts a new title after the create_survey link is clicked
Merge pull request #8 from conman246/conman_branch

Conman branch
Merge pull request #9 from conman246/working

Working