Gemfile.lock shouldn't be in the repo
Merge branch 'master' of github.com:mytestbed/labwiki

Conflicts:
	Gemfile.lock