NeuralNerwork
Merge branch 'master' of https://github.com/yamahei7/Machine_Learning

Conflicts:
	NeuralNet.py
	NeuralNet.py~