update
Merge branch 'master' of https://github.com/thorbenk/ia13project

Conflicts:
	lables/h52png.py