adds omniauth-twitter gem and omniauth initializer
adds omniauth-twitter gem and omniauth initializer
adds omniauth-twitter gem and omniauth initializer for real this time...
fixes figaro
trips test
Merge branch 'master' of github.com:coreyd303/feed_engine_rails into trips
logic for trips to display on groups show
routes and crud for trips
fix merge conflicts
add index to users controller, clean up trips and user controller
Merge branch 'master' of github.com:coreyd303/feed_engine_rails into instagram
Add user Serializer, clean up insta workers, instas headed out with users on API
users logic and crud fixed
remove gemfile.lock
updates user model schema, omniauth works
Fix trip migration, serializer, and seed file
Merge branch 'master' of github.com:coreyd303/feed_engine_rails into remove-group

Conflicts:
	app/serializers/user_serializer.rb
remove group controller, model, serializer, migration, groupuser migration, spec, factory, and seed method from app.
Switch user migration, model, seeds, and serializer to use 'name' instead of both 'first_name' and 'last_name' per group discussion.
Change trip migration, model, and seeds to use 'date' instead of 'start_date' and 'end_date' per group discussion.
Add TripsUsers join table for Trips Users many-to-many relationship.
Update Trips and Users models for their-many-to-many relationship.
Update seeds.rb file to reflect changes in schema.
Remove random '47:' file (probably one I accidentally put in there because vim).
Remove 'test' dir because RSpec.