first commit
first commit
second commit
Merge branch 'master' of https://github.com/asimbhatti786/learn-rails

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/contacts_controller.rb
	app/models/contact.rb
	config/environments/development.rb