Ubuntu test Commit + Debugging
Merge branch 'master' of https://github.com/psud/BWS-Info-Apps

Conflicts:
	.classpath
	bin/InfoApps.apk
	bin/classes.dex
	bin/classes/com/example/infoapps/BusFahrtkosten$1.class
	bin/classes/com/example/infoapps/BusFahrtkosten.class
	bin/classes/com/example/infoapps/DreieckTester2.class
	bin/classes/com/example/infoapps/Funktionsgleichung.class
	bin/classes/com/example/infoapps/KaffeeTemp.class
	bin/classes/com/example/infoapps/LottoZahlen.class
	bin/classes/com/example/infoapps/Palindrome.class
	bin/classes/com/example/infoapps/SkelettGrosse.class
	bin/classes/com/example/infoapps/WaagerechterWurf.class
	bin/classes/com/example/infoapps/Wechselgeld.class
	bin/classes/com/example/infoapps/Weckzeit.class
	bin/classes/com/example/infoapps/Wetter.class
	bin/classes/com/example/infoapps/ZahlenBildungsgesetz.class
	bin/classes/com/example/infoapps/ZahlenInWorte.class
	bin/classes/com/example/infoapps/ZahlenRaten.class
	bin/classes/com/example/infoapps/ZulassungOberstufe.class
	res/layout/lottozahlen.xml
	src/com/example/infoapps/ZahlenInWorte.java
Merge branch 'master' of https://github.com/psud/BWS-Info-Apps

Conflicts:
	bin/InfoApps.apk
	bin/classes.dex
	bin/classes/com/example/infoapps/ZahlenInWorte.class
	src/com/example/infoapps/ZahlenInWorte.java
Test Zen 2
ubuntu 3