updates to basic objects tests
Merge branch 'master' into basic_class_building

Conflicts:
	test/customer_test.rb