shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/en/neuralnet/ocr/Main.java
	src/en/neuralnet/ocr/NeuralNetwork.java