2.2 done.
conflict merges
best we can do on NN - it converges (sorta)
did most of the work on II.2.3.1
Merge branch 'master' of https://github.com/andreasbock/statml

Conflicts:
	case3.py