updates ruby-version to latest 2.0.0
bump ruby version to 2.1
Update ruby version to 2.1.0
udpate to 2.1.0 ruby
Updates to the schema and Gemfile
implemments milestones
Merge branch 'feature/queries' into develop
Explicitly declare the image assets for sprockets
Clean up the scss file
resolve git conflict