merge
Merge branch 'neuralnetwork' of https://github.com/abrahamks/IF4071-Machine-Learning-2013 into neuralnetwork

Conflicts:
	ANN/src/ann/ANN.java