some stuff?
Merge branch 'master' of https://github.com/daswolle/DigitalRuler

Conflicts:
	bin/classes/com/example/digitalmeasuringtape/MainActivity.class