Merge branch 'master' of https://github.com/jrosen3/cs109annstock

Conflicts:
	.ipynb_checkpoints/ANN-checkpoint.ipynb
	ANN.ipynb