+
+Merge branch 'master' of github.com:karpovr/veda

Conflicts:
	public/tests.html