Merge branch 'master' of https://github.com/Pkmmte/Personal-Calculator

Conflicts:
	PersonalCalculator/bin/PersonalCalculator.apk
	PersonalCalculator/bin/classes.dex
	PersonalCalculator/bin/classes/com/pk/personalcalculator/ActivityMain.class
	PersonalCalculator/bin/resources.ap_
	PersonalCalculator/gen/com/pk/personalcalculator/R.java

Merged and fixed conflicts.