changes in Gemfile.lock
Merge branch 'master' of github.com:BarbateSparrow/new_one

Conflicts:
	Gemfile.lock