sign in
Merge branch 'master' of github.com:sachindeshpande/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb