vi edit
Merge branch 'master' of github.com:zhukejun/first_app

Conflicts:
	Gemfile