Routing for my survey and all survey pages
resolve application.js merge conflicts
Merge pull request #5 from 4justinstewart/AndrewY-Routes

Andrew y routes
Merge branch 'master' into Santrece-login
"merge this shit...."