Admin Fix
Merge branch 'master' of
https://github.com/titu1994/SOOAD-Mini-Project.git

Conflicts:
	SOOAD Mini Project/src/source/ClientUI.java