festival durante a funcionar
Merge branch 'master' of https://github.com/andreborralho/festivAllClient.git

Conflicts:
	index.html
	js/festival.js
	js/show.js