added label stuff
Merge branch 'master' of github.com:ManuKrapf/IntTec

Conflicts:
	blatt7/activity.py