Merge pull request #7 from Flamdoodle/pei_stephen

Pei stephen
Merge pull request #8 from Flamdoodle/pei_stephen

merge conflict resolution.
Merge pull request #10 from Flamdoodle/bev_ryan

add questions view, working on question creation
Merge pull request #11 from Flamdoodle/pei_stephen

Merge pull request #9 from Flamdoodle/bev_ryan
-rename surveys.erb to all_surveys.erb
-add seed file to generate fake users and surveys
-allow user to complete surveys and have results update the database