location
Merge branch 'master' of https://github.com/anjalijaiswal/Where_i_am
Latest Push
Conflicts:
	app/controllers/friendships_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/anjalijaiswal/Where_i_am
latest 2
Conflicts:
	config/database.yml
	db/schema.rb