blah
klolMerge branch 'master' of github.com:knope/docker-squid

Conflicts:
	Dockerfile