gemfile.lock ??
..
Merge branch 'master' of https://github.com/nyabb/poc

Conflicts:
	Gemfile.lock