bugs
Merge branch 'master' of https://github.com/wiesson/ProbeReader

Conflicts:
	app/app.py