a
Merge branch 'master' of https://github.com/dima32ml/zero

Conflicts:
	test.cpp