123
Merge branch 'master' of https://github.com/chrysler76/logoergo

Conflicts:
	ergo_kontakt.html
	ergo_kontakt.php
	logo_kontakt.html