Commit to merge
Merge branch 'master' of https://github.com/davidamin/CS3240Project

Conflicts:
	Client/client.py