Added GUI
Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/Ipsum/network

Conflicts:
	lab2/Design.doc
	lab2/client.py