test
Merge branch 'master' of https://github.com/Ainer/bakca

Conflicts:
	testApp/testApp/DSMTS.cpp
	testApp/testApp/DSMTS.h
test