Laptop commit
Merge branch 'master' of github.com:Schmoopy/squid

Conflicts:
	test.html
Fixed conflict