right
Merge branch 'master' of https://github.com/mmbradle/RefactorTest.git

Conflicts:
	src/Customer.java