Time remains when pressing stop
Merge branch 'master' of https://github.com/mdrabick/RowingManager

Conflicts:
	bin/RowingManager.apk
	bin/classes.dex
	bin/classes/com/example/rowingmanager/MainActivity.class
	bin/resources.ap_