Changed gemfile locally
Merge branch 'master' of github.com:soroushjp/demo_app

Conflicts:
	Gemfile