new layout
Merge branch 'master' of github.com:veriqual/calculator
nita pulled

Conflicts:
	calc/project.properties
	calc/res/layout/activity_main.xml
	calc/res/layout/calc.xml
	calc/res/values/styles.xml
	calc/src/com/example/calc/MainActivity.java
message
Merge branch 'master' of github.com:veriqual/calculator

Conflicts:
	calc/res/layout/calc.xml
	calc/src/com/example/calc/Calc.java
	calc/src/com/example/calc/MainActivity.java
kkkk
Merge branch 'master' of github.com:veriqual/calculator
anita