some python testing
Merge branch 'master' of https://github.com/vysheng/tg

Conflicts:
	Makefile