MAJ
Merge branch 'master' of https://github.com/Khral/TpGo

Conflicts:
	main.cpp