changed
Merge branch 'master' of github.com:veriqual/Calculator
final merge

Conflicts:
	calc/AndroidManifest.xml
	calc/res/layout/activity_main.xml
	calc/res/layout/calc.xml
	calc/src/com/example/calc/Calc.java