recent updates
Merge branch 'httpBuilder' of github.com:WillBDaniels/JavaServer into httpBuilder

Conflicts:
	src/main/java/com/server/HandleTCP.java