bla bla
Merge commit '17a26ca85afa48b1c8b09a9ddf7431bdaff8f0a5'

Conflicts:
	src/NeuralNetwork/Network.java