removed Gemfile.lock
Merge branch 'master' of github.com:haotianwang/CanvUs
okokoko

Conflicts:
	Gemfile.lock