Update der .gitignore; Anpassen der Main (Bug)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Core/Main.java