Base
Merge branch 'master' of https://github.com/SteffenGeorgi/KerweAPP

Conflicts:
	index.html