new file:   .gitignore
	modified:   Konflikt.java