The final commit.... FOR NOW!
Merge branch 'master' of https://github.com/MariaBarrett/ML3

Conflicts:
	OurSVM.pyc
	nn.pyc