First commit of diff.txt
Final commit
Add roc.c
add 1 more line by wukong
Added by bajie
wukong's 2nd commit
Merge branch 'bajie' into wukong

Conflicts:
	roc.c