some goods
hm
hm
Merge branch 'master' of github.com:deyl94/TPc--

Conflicts:
	build-dz4-Desktop-Debug/Makefile
	build-dz4-Desktop-Debug/dz4
	build-dz4-Desktop-Debug/dz4.o
	dz4/dz4.pro.user