de la merde
Merge branch 'master' of github.com:RobinJeannel/share-my-bike
Merge branch 'master' of github.com:RobinJeannel/share-my-bike
Merge branch 'master' of github.com:RobinJeannel/share-my-bike

Conflicts:
	db/schema.rb