update
update hours
Merge remote-tracking branch 'origen/master'

Conflicts:
	bitacora.txt