Conflict virgin
Merge pull request #27 from Sbfrr/solve_conflicts

Conflict virgin
Only test for the gem
Merge branch 'master' of github.com:Sbfrr/uberify

Conflicts:
	app/controllers/uberify/providers_controller.rb
	spec/app/controllers/uberify/providers_controller_spec.rb
	spec/factories/providers.rb
Merge branch 'master' into test_only

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/uberify/application_controller.rb
	app/controllers/uberify/dynamic_positions_controller.rb
	app/models/uberify/static_position.rb
	config/routes.rb
	db/migrate/20140603140922_create_uberify_dynamic_positions.rb
	lib/uberify.rb
	lib/uberify/engine.rb
	spec/dummy/config/database.yml
	spec/dummy/config/routes.rb
	spec/dummy/config/secrets.yml
	test/fixtures/uberify/dynamics.yml
	test/fixtures/uberify/statics.yml
	test/models/uberify/dynamic_test.rb
	test/models/uberify/static_test.rb
	uberify.gemspec
Revert "Merge pull request #27 from Sbfrr/solve_conflicts"

This reverts commit 9fe41d190f461b97b01ae499840c050e3efa6413, reversing
changes made to 8b55552fe5816d73afbc57952f9467f6aafa79b0.
Revert "Merge branch 'master' of github.com:Sbfrr/uberify"

This reverts commit 1406604130382429a033a0610418137fd46306e9, reversing
changes made to 9fe41d190f461b97b01ae499840c050e3efa6413.
Only tests
Merge pull request #28 from Sbfrr/test_only

Should be ok