finished
Merge branch 'master' of github.com:HannahCarney/Boris_Bikes

Conflicts:
	lib/bike_container.rb
all changes