More documentation
Merge branch 'master' of https://github.com/Marist-OpenFlow/Archon

Conflicts:
	GUI.py