Merge branch 'master' of https://github.com/claytontkirby/computernetworksproject

Conflicts:
	main_folder/client.out
	main_folder/server.out