test1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/sample_app.iml
	Gemfile
	Gemfile.lock