merge?!

Signed-off-by: Odd Andreas <osorseth@gmail.com>
Merge branch 'master' of https://github.com/Oddsor/EvolAlgo

Conflicts:
	src/evolalgo/problem/SpikingNeuron.java
	src/evolalgo/problem/sdm/SpikeTimeDistance.java