update

modified these files to do some house cleaning on minor items. No change
in programming functionality. Just house cleaning
Merge branch 'HEAD' of https://github.com/RICJ2/CJ2.git

Conflicts:
	NetBeansProjects/LoginScreen/src/loginscreen/LoginScreenForm.java
	NetBeansProjects/LoginScreen/src/loginscreen/Student.java
Merge branch 'master' of https://github.com/RICJ2/CJ2