a
a
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASquare/AndroidManifest.xml
	ASquare/bin/ASquare.apk
	ASquare/bin/AndroidManifest.xml
	ASquare/bin/classes.dex
	ASquare/bin/resources.ap_
	ASquare/gen/com/example/asquare/R.java
b
Merge branch 'master' of https://github.com/chrislol/A_square.git

Conflicts:
	ASquare/bin/ASquare.apk
	ASquare/bin/resources.ap_