Update 20140725121552_create_choices.rb
Update 20140725120303_create_questions.rb
Update 20140725120252_create_users.rb
fixed response model
fixed models and migrations AGAIN
Merge branch 'master' into test-seed-data
fixed conflicts
Merge pull request #6 from cassiemoy/models

Models
Merge branch 'master' into test-seed-data
Change minor typos in controller files, test seed data ready for users, surveys, and questions