complete broken bikes
Merge branch 'master' of https://github.com/tboeckmann/borris_bikes

Conflicts:
	lib/dockable.rb