just checking
Merge branch 'master' of https://github.com/EllenSebastian/AI-bitcoin

Conflicts:
	p-progress/NeuralNetwork.py