complex through hw2 q3.
Merge branch 'master' of https://github.com/rforgione/mlearn

Conflicts:
	setup.py