Added a simple domain object to model Survey data
Resolved Gemfile conflicts