huj
Merge branch 'master' of https://github.com/dolgovz/dsqcpp

Conflicts:
	strix.sdf