ok
Merge branch 'master' of ssh://github.com/antinucleon/cxxnet

Conflicts:
	test/mnist.conf