Upd
Merge branch 'master' of https://github.com/YakiYaki/math

Conflicts:
	cpp/compute.cpp