govnokod
Merge branch 'master' of https://github.com/romathebest/stoyan

Conflicts:
	MathMod/MathMod.pro.user
	MathMod/mainwindow.cpp
	MathMod/mainwindow.ui