Ajustes
Merge branch 'master' of https://github.com/roldaojr/ifrn-tads-akranoid

Conflicts:
	arkanoid/src/br/ifrn/tads/arkanoid/gui/JanelaPrincipal.java
	arkanoid/src/br/ifrn/tads/arkanoid/gui/TelaInicializacao.java