Merge branch 'master' of https://transfer.hft-stuttgart.de/gitlab/ugl/website.git

Conflicts:
	public/index.html
	readme.md