Something
Merge branch 'master' of https://github.com/mranzinger/AxonNet

Conflicts:
	include/functions.h
	include/neuron_layer.h
	src/functions.cpp