Get Gemfile.lock back
Merge branch 'master' of github.com:heidar-ice/fatlosspro

Conflicts:
	Gemfile.lock