JavaScript and JSON shell
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into jack_branch
more route detail
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into jack_branch
more route detail
more route details
Merge pull request #8 from wisconsinpoet/bird_branch

added a view for create_survey
Merge pull request #10 from wisconsinpoet/bird_branch

changed sloth picture
created text files with survey questions to integrate into seed file
trying to merge conflicts
Update index.erb
fixing fixed merge conflicting conflicts