middleware
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/middleware/FileMiddleware.java
	src/webserver/Response.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/webserver/Client.java
	src/webserver/Server.java