Arrumando os testes
Merge branch 'master' of github.com:Diegoamc/EP3_MAC0448

Conflicts:
	router.rb