resolução e skell
Merge branch 'master' of github.com:Highvolt/FEUPdemic

Conflicts:
	console.log