Conflito
Comentário
Merge remote-tracking branch 'origin/branch02'

Conflicts:
	src/main/java/Controller/Controller.java