debugging
Merge branch 'master' of https://github.com/zaphinath/NeuralNetwork

Conflicts:
	src/NeuralNetwork.java
Merged
fixed ordering bug

need to make sure backprop is right equation