editando...
Merge branch 'master' of https://github.com/viktormameluk/Trabalhopratico1
Merge branch 'master' of https://github.com/viktormameluk/Trabalhopratico1
Adicionando links ao index1.html
Finalizando ediaçao
Merge branch 'master' of https://github.com/viktormameluk/Trabalhopratico1
Merge branch 'master' of https://github.com/viktormameluk/Trabalhopratico1

Conflicts:
	viktor.html