Merge pull request #20 from wisconsinpoet/jack_branch

Jack branch
working on routes
correct controller for sign in
conflict
Merge pull request #21 from wisconsinpoet/lauren

correct controller for sign in
i hope this works
user sign up is working with new models, added rudimentary nav bar
Merge pull request #22 from wisconsinpoet/lauren

user sign up is working with new models, added rudimentary nav bar
in middle of working on create survey form and javascript
oh my god the create survey form is finally kind of starting to be a thing, if only in its title capturing abilities
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into bird_branch

Merge changes from Lauren and Danny..
added question entry form on create survey form, ALMOST have it working
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into lauren
Merge pull request #23 from wisconsinpoet/lauren

Lauren
trying to get db working again
pulling changes in
updated
revert to google hosted jQuery lib
fixed migration names
removed superfluous migrations