Pre merge
Merge branch 'master' of https://github.com/krzysztofK/NeuralNetworks

Conflicts:
	NeuralNet/src/net_structure/network.py
Network merged