conflito
Merge branch 'master' of github.com:flparaujo/lab3

Conflicts:
	lab3/.target/controllers/Application.class
	lab3/.target/models/Disciplina.class
	lab3/.target/models/Periodo.class
	lab3/.target/tdd/SistemaDePlanejamentoDeCursoTest.class
	lab3/app/models/Disciplina.java