Merge pull request #8 from mreid1130/seed_file

reviewed and ok'd
added user auth
hid password entry
Merge pull request #9 from mreid1130/index.erb

ok'd and merged
survey has multiple question fields and sends well-formatted params to post
fixed controller merge conflict
Merge pull request #11 from mreid1130/view_survey

reviewed and ok'd
fixed merge conflict
updating current working branch

Merge branch 'master' of https://github.com/mreid1130/SurveySapien into user_auth
fixed merge conflict, added buggy user auth
trying to fix merge conflict
Merge pull request #12 from mreid1130/user_auth

reviewed and ok'd
Merge branch 'master' of https://github.com/mreid1130/SurveySapien into create_survey.erb

Just merging!
fixed user auth login bug
Merge pull request #13 from mreid1130/user-auth

reviewed and ok'd
survey creation form works
Merge branch 'master' of https://github.com/mreid1130/SurveySapien into create_survey.erb
Merge pull request #14 from mreid1130/create_survey.erb

reviewed and ok'd
fixed database error
fixed database error