inicio do projecto
Merge branch 'master' of https://github.com/miguellosa/EAPLI2DF

Conflicts:
	.gitignore
	README.md