ok teste a
Merge branch 'master' of https://github.com/gtrajber/lista5

Conflicts:
	1164.c
corrigidos 1263 ok