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

Conflicts:
	ipch/strix-df5faf24/strix-aca09286.ipch
	strix.sdf
	strix.suo
	strix/Lots.cpp