kladno front
Merge branch 'master' of https://github.com/hjujah/kladno

Conflicts:
	public_html/css/main.css