Moved neural connections to Neuron from NeuralNetwork, edited project
settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	NeuroNet/.classpath
	NeuroNet/.project