Merge 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dados/agenda.txt
	package.bluej