hau commit 2
hau commit 2
Merge origin/master

Conflicts:
	.gitignore
	src/gittestprojekt/GitTestProjekt.java
hau 1