Merge branch 'B'
Merge branch 'B'
Merge branch 'b-rup-felipe'

Conflicts:
	css/disciplina.css
	disciplina.html
	json/modelagem_negocio.json
Merge branch 'b-rup-felipe'

Conflicts:
	json/disciplinas.json
Revert "Merge branch 'b-rup-felipe'"

This reverts commit ecbc8e9086dfffef557dc6261e518fb103e37dd5, reversing
changes made to 72ddfa7dc9b3ed8af74a3f87294b5a87a2ee78d9.
Soluçao de conflito

Resolvendo conflito de erros na master
nda
Merge branch 'b-rup-felipe'

Conflicts:
	css/disciplina.css
	disciplina.html
	json/modelagem_negocio.json
Nda
nda
Merge branch 'master' into b-rup-felipe