test
test
Merge branch 'master' of https://github.com/BlackConsole/TestTimer

Conflicts:
	main.cpp
	untitled.pro
	untitled.pro.user