cns
Merge branch 'master' of https://github.com/alexeyche/snn_sim

Conflicts:
	constants.ini
cns