T40&T41
Merge branch 'datastructure' of https://github.com/tenddy/programs into datastructure

Conflicts:
	main.cpp
	mytest.h