.
.
Merge branch 'master' into user_b
added the user erb and the rout for create survey
Merge pull request #5 from jsuich/user_b

User b