Renew Gemfile and untrack Gemfile.lock
Merge branch 'master' of github.com:wangguoqin1001/Acubens

Conflicts:
	Gemfile.lock