guku

tnt.html erro
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/second.js
	tnt.html