Merge branch 'master' of https://github.com/luoyulong/RtrainingData

Conflicts:
	performanceDB.R