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

Conflicts:
	yyyyyy/src/com/example/yyyyyy/newActivity.java
2
Merge remote-tracking branch 'origin/master'

Conflicts:
	yyyyyy/src/com/example/yyyyyy/newActivity.java