update android studio
Merge branch 'master0324'

Conflicts:
	TouchCalc/src/main/java/com/example/touchcalc/MainActivity.java
	TouchCalc/src/main/res/layout/activity_main.xml
update android studio