um mergen zu koennen
Merge branch 'master' of https://github.com/milchmaedchen/SirDaniel

Conflicts:
	src/general/BarcodeReader.java
	src/general/Settings.java
	src/p1_labyrinth/P1.java
	src/p2_Bridge/P2.java