working on routes
conflict
i hope this works
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into bird_branch

Merge changes from Lauren and Danny..
trying to get db working again
pulling changes in
updated
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into bird_branch
fixed extra migration belongs_to even though it is superfluous
cleaning up media and destroying .orig files
removed log file
fixed index survey.user_id typo on index - specific to bird branch
Merge pull request #25 from wisconsinpoet/bird_branch

Bird branch