init
Merge branch 'master' of https://github.com/markuskreth/trampolinWertungBusiness

Conflicts:
	.gitignore