commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	trabalho/1012377/src/visualizacao/XadrezPainel.java