ficheiros iniciais
Merge https://github.com/garridinho/Programacao-lentes

Conflicts:
	Makefile