I don't even remember.
Merge branch 'master' of https://github.com/eronth/AlcCalc

Conflicts:
	AlcCalc/res/values/strings.xml
	AlcCalc/src/com/mtankindustries/alccalc/AlcCalc.java