renamed loginScreen to classScheduler
Merge branch 'master' of https://github.com/RICJ2/CJ2

Conflicts:
	NetBeansProjects/LoginScreen/src/loginscreen/ClassScheduler.java
	NetBeansProjects/LoginScreen/src/loginscreen/mediatorbackup.java