up
Merge branch 'master' of https://github.com/WeiFoo/Research

Conflicts:
	defect prediction/.DS_Store
	defect prediction/data/.DS_Store
	defect prediction/data/trainingData
	defect prediction/lib.pyc
	defect prediction/main.pyc
	defect prediction/table.pyc
update