local
Merge branch 'master' of https://github.com/manaspaldhe12/Calculator

Conflicts:
	bin/classes.dex
Fractionize