Correção de Fixture
Merge branch 'master' of https://github.com/alexandrebispo/code_Projeto4

Conflicts:
	.idea/.name
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml
	admin/painel/engine/rotas.php
	engine/config.php
	fixture.php