made common branch
Merge branch 'threes' into common

Conflicts:
	lib/TrainNN.hs
	threes/Main.hs
Running again.
Some framework.
Merge branch 'common' into nnet