Added network and gui targets to the Makefile
Merge branch 'master' of https://github.com/Swuu/Settlers-of-Catan-Game
Fixed Makefile merge issue. Added network and gui targets to Makefile
Conflicts:
	Makefile