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

Conflicts:
	ergo_home.html