sa
Merge branch 'master' of https://github.com/sparrowbg/mocha

Conflicts:
	test/tetov.conf