Git Init
Merge branch 'master' of https://github.com/TS-ZH-Informatik/Java-Interface-poly

Conflicts:
	.gitignore