haproxy
Merge github.com:bjgilbertschl/haproxy

Conflicts:
	README.md