fixed
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA

Conflicts:
	src/com/cssa/app/qiu_rui_qing/qiu_rui_qing.java
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA
test
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA.git into master2
trash
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA.git into master2
commmit