xzczx
Merge branch 'master' of https://github.com/DavidSalzer/rothschild-kube-appliaction

Conflicts:
	css/style.css
	index.html