moving and adding classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/AdminWorker.java
	src/GUI/GUILogic.java
	src/GiantSwitch.java
	src/databaseMethods/SwitchMethods.java