tried something
Merge branch 'master' of github.com:zhengjiezxxy/moonbay

Conflicts:
	Gemfile
	Gemfile.lock