Juncao dos Branchs
Adicionado o arquivo Diagrama.asta
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	bin/.gitignore