manual merge
Merge branch 'master' of https://github.com/mmbradle/RefactorTest

Conflicts:
	src/Customer.java