unmeged files
stuff
STUFF
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into jack_branch
modified migrations
table changes
test
Merge pull request #19 from wisconsinpoet/lauren

Lauren
final migration tables and models
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into jack_branch
Merge pull request #20 from wisconsinpoet/jack_branch

Jack branch
correct controller for sign in