Mudança interface e criação de resolução Explicita
Merge branch 'master' of https://github.com/CaferCruz/SegundoTrabPC

Conflicts:
	WaveEquation/src/pc/Main.java
	WaveEquation/src/view/Programa.form
	WaveEquation/src/view/Programa.java