Taschenrechner auskommentiert.
Merge branch 'master' of https://github.com/nschrack-tgm/SYT-INDINF-05

Conflicts:
	SYT-INDINF-05.xcodeproj/project.pbxproj

SYT-INDINF-05.xcodeproj/project.xcworkspace/xcshareddata/SYT-INDINF-05.x
ccheckout