added city data member to customer and manager
added new functionality and organized storeTest
added functionality and reorganized