trying to fix merge conflict
Merge branch 'master' of https://github.com/mreid1130/SurveySapien into create_survey.erb

Just merging!
survey creation form works
Merge pull request #14 from mreid1130/create_survey.erb

reviewed and ok'd