first commit in this branch
modified a in hotfix
Merge branch 'master' of https://github.com/florincatana/tg
Merge branch 'testing'

Conflicts:
	README.md