Merged my local file with last commit. (this better work)
k
hi2
Merge branch 'master' of
https://github.com/justonium/EvolverRepository.git

Conflicts:
	Evolver/src/Brain/Neuron.py
	Evolver/src/Brain/Synapse.py