fix conflict
PCN Works!
Merge branch 'master' of https://github.com/WYSIATI/Machine-Learning

Conflicts:
	kfold.py
	kfold.pyc
	pcn.pyc
	rbf.pyc
	temp.py
resolved conflict