.
Merge branch 'master' of github.com:coyotte508/neurons

Conflicts:
	scripts/simul4.py
Merge branch 'master' of github.com:coyotte508/neurons
Merge branch 'master' of github.com:coyotte508/neurons
Merge branch 'master' of github.com:coyotte508/neurons