Gemfile update
Merge branch 'master' of https://github.com/bankair/velib

Conflicts:
	Gemfile