gf
Merge branch 'master' of https://github.com/chrislol/A_square.git

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