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

Conflicts:src/gui/CustomerGUI.java

Signed-off-by: vtenorio1 <vtenorio1@student.gsu.edu>
ignored classpath