fix formatting with the panel stuff
Merge branch 'master' of https://github.com/mjelks/EIMSApp

Conflicts:
	src/EIMS/SysAdmin.java