Plop.
Merge branch 'master' of https://github.com/jonkirkman/tronhub

Conflicts:
	.gitignore
	LICENSE
	README.md