linha modificada
Corrigindo merge
Merge branch 'master' of https://github.com/lucasfurlani/avs

Conflicts:
	client/main.html