commit for merge
?
Merge branch 'master' of https://github.com/zhenchentl/CCRec-Full into OSNCC

Conflicts:
	CCRec-Full.pdf

change the author list
merge
merge