migrations
Merge pull request #2 from cassiemoy/christian

migrations
Merge pull request #3 from cassiemoy/models

Models
Update 20140725121552_create_choices.rb
Update 20140725120303_create_questions.rb
Update 20140725120252_create_users.rb
fixed conflicts