Changed t in hello tron to upper case.
Merge branch 'master' of github.com:cshinaver/tron

Conflicts:
	func.c