Comment
Merge branch 'master' of https://github.com/vdrhtc/Conductivity.git

Conflicts:
	src/conductivity/simulation/equationeer.py
И еще можно