lots of changes...I'm not sure why
Merge remote-tracking branch 'origin/master'

Conflicts:
	Admin.py
	AdminGUI.py
	ClientGUI.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client.py
	config.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	AdminGUI.py