comit conflito 2
Merge branch 'master' of https://github.com/alissonrangel/farmacia2

Conflicts:
	src/main/webapp/remedios.xhtml