supposedly finished client
Merge branch 'master' of https://github.com/awachte/ATM560Lab

Conflicts:
	Alicean/.metadata/.plugins/org.eclipse.core.resources/.projects/ServerClient/.markers.snap
	Alicean/.metadata/.plugins/org.eclipse.core.resources/.projects/ServerClient/.syncinfo.snap
	Alicean/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Alicean/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Alicean/.metadata/.plugins/org.eclipse.core.resources/.snap
	Alicean/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Alicean/.metadata/.plugins/org.eclipse.jdt.core/368138857.index
	Alicean/ServerClient/src/Client.java