git commit
weMerge branch 'master' of https://github.com/kareem1234/COMP3004

Conflicts:
	ClientNetworking/ClientNetworking.pro.user
Merge branch 'master' of https://github.com/kareem1234/COMP3004
changes