initial home implementation
Merge branch 'develop' of github.com:pkwiecien/tumitfahrer into home_dev
added home scree, add ride, sign_in functionality
Merge branch 'develop' of github.com:pkwiecien/tumitfahrer into home_dev

Conflicts:
	db/schema.rb
search changes
Merge branch 'develop' of github.com:pkwiecien/tumitfahrer into home_dev

Conflicts:
	Gemfile.lock
	db/schema.rb
new ride and details page implementation.
Added Search functionality.
Added profile page.
User Profile functionality added.
sign up functionality and campus and activity rides
Merge branch 'home_dev' of github.com:pkwiecien/tumitfahrer into anuradha_temp

Conflicts:
	Gemfile
	app/models/user.rb
	config/routes.rb
small view changes.
Campus

Merge branch 'home_dev' of github.com:pkwiecien/tumitfahrer into anuradha_temp
changes in the view
Merge branch 'shahid_dev' of github.com:pkwiecien/tumitfahrer into anuradha_temp

Conflicts:
	Gemfile
	app/assets/images/InfoIconBlack.png
	app/assets/images/PassengerIcon.png
	app/controllers/rides_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/rides/show.html.erb
	app/views/users/new.html.erb
	config/environments/development.rb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
Timeline,campus,activites and myrides page
Merge remote-tracking branch 'origin/anuradha_temp' into beta_wb_testing

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/searches.css.scss
	app/controllers/users_controller.rb
	app/views/rides/show.html.erb
Merge conflicts removed.