tst
Merge branch 'master' of https://github.com/rozehnal/mywac

Conflicts:
	public_html/index.html