add corrplot package
fix conflicts

Merge branch 'master' of github.com:marshallpku/Learn-PenSim

Conflicts:
	flows 3Darray.R