Alex's code.
Merge branch 'master' of
https://github.com/pacohojaverde/adHocBoeBot.git

Conflicts:
	Server_Project_With_GUI.py
	
Conflicts have been resolved.
Fixed a spacing error.