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