a
Merge branch 'master' of github.com:GutAmanai/TG

Conflicts:
	TG.sln