commit
Merge branch 'master' of https://github.com/npi-ufc-qxd/gal.git

Conflicts:
	aplicacoes/gal_npi/.classpath
	aplicacoes/gal_npi/.settings/.gitignore