merge
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA into HEAD

Conflicts:
	src/com/cssa/app/qiu_rui_qing/qiu_rui_qing.java
a little fix
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA into HEAD

Conflicts:
	src/com/cssa/app/qiu_rui_qing/qiu_rui_qing.java
event date added
Merge commit '9219646'

Conflicts:
	src/com/cssa/app/qiu_rui_qing/qiu_rui_qing.java