pre-merge commit
Merge branch 'master' of https://github.com/bjacobel/neuralnet

Conflicts:
	neuralnet.java