grr merging
Merge branch 'master' of https://github.com/joernklinger/NaiveBayes

Conflicts:
	NaiveBayes3.pyc
progress