delete from file
merge
Merge branch 'master' of https://github.com/dolgovz/dsqcpp

Conflicts:
	Debug/strix.exe
	Debug/strix.pdb
	ipch/strix-df5faf24/strix-aca09286.ipch
	strix.sdf
	strix.suo
	strix/Debug/CL.read.1.tlog
	strix/Debug/CL.write.1.tlog
	strix/Debug/Lots.obj
	strix/Debug/link.command.1.tlog
	strix/Debug/main.obj
	strix/Debug/mt.command.1.tlog
	strix/Debug/strix.lastbuildstate
	strix/Debug/strix.log
	strix/Debug/vc100.idb
	strix/Debug/vc100.pdb
	strix/Lots.cpp
	strix/lots.dev
	strix/main.cpp
hujovij visual studio