more changes
Merge branch 'master' of https://github.com/wangwf/Cpp

Conflicts:
	R/R-programming/rankall.R
 p2.R