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

Conflicts:
	src/com/cssa/app/qiu_rui_qing/qiu_rui_qing.java
Monsoon Strings
update
Merge branch 'master' of github.com:RuiqingQiu/CSSA

Conflicts:
	project.properties
newstudent runable
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
event date added
string is commented
chapter 1 and 3 done
what happened
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA

Conflicts:
	project.properties