Merge branch 'master' of https://github.com/anj1/NeuralNets.jl

Conflicts:
	train.jl