Resettet
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/plagiatssoftware/Main.java