added accessory test object, discovered keyboard bug in AccessoriesVC
Merge branch 'dev2' into shoppingCart
Merge branch 'dev2' into shoppingCart
Merge branch 'dev2' of https://github.com/Valak12/CityBicycleCompanySecond into shoppingCart
Merge branch 'dev2' into shoppingCart
trying to combine arrays
Merge branch 'shoppingCart' into dev2
added branch
created shoppingCartArray that contains both chosenBike and chosenAccessory objects
will merge with dev2
merge conflict fixed i hope