updates
Merge branch 'master' of https://github.com/ttruong17/ProjectCIS3270

Conflicts:
	src/gui/CustomerGUI.java