updated gemfile with all the gems we will/should be using
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
RE updated gemfile with gems we will be using
removed roles routes
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app into routes

Conflicts:
	Gemfile
migrations refined
added routes
seeded users and events
Merge pull request #2 from thebkbuffalo/routes

Routes
Merge pull request #3 from thebkbuffalo/seedfile

Seedfile
seedfix
actual seedfix
RE RE updated gemfile
Merge branch 'master' into update_models

Conflicts:
	Gemfile.lock