progress
HAproxy in da house
Merge remote-tracking branch 'origin/master'

Conflicts:
	fig.yml.tpl
Merge remote-tracking branch 's-urbaniak/master'