adicao de tempo
adiciona master
Merge branch 'tempo'

Conflicts:
	go.m