Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	src/ca1ase/server/ClientHandler.java
Tilføjet Webpages - Og skrevet HTTP / html
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	nbproject/project.properties
	src/ca1ase/server/ClientHandler.java