change gemfile
Merge branch 'master' of https://github.com/ParisZX/first_app

Conflicts:
	Gemfile