Merge branch 'master' of /Users/Marbo/PycharmProjects/CS3240Project with conflicts.
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	Client/client.py
working client