added user auth
hid password entry
fixed controller merge conflict
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
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!
survey creation form works