yep
Merge branch 'master' of https://github.com/cassiecorey/Sobriety

Conflicts:
	bin/Sobriety.apk
	bin/classes.dex
	bin/resources.ap_
Merge branch 'master' of https://github.com/cassiecorey/Sobriety
complete calculator