Gemfile.lock is needed
Merge branch 'master' of https://github.com/metamorph/tipsex

Conflicts:
	Gemfile.lock