Merge branch 'master' of https://github.com/jjlakin/Boris-Bikes

Conflicts:
	lib/garage.rb
Merge branch 'master' of https://github.com/jjlakin/Boris-Bikes

Conflicts:
	lib/garage.rb
Merge branch 'master' of https://github.com/ptolemybarnes/BorisBikes
Conflicts:
	lib/garage.rb
Merge branch 'master' of https://github.com/ptolemybarnes/BorisBikes

Conflicts:
	lib/garage.rb