fixing up lines
updating bike
Merge branch 'development' of https://github.com/yoshdog/boris-bikes into create-docking-station
updated docking
Merge branch 'create-docking-station' into development
Merge branch 'development'