NeuralNetwork
Merge branch 'master' of http://github.com/Totonut/YolOCR

Conflicts:
	Makefile
	interface.h