css para el aplicativo
Merge branch 'master' of https://github.com/nexcax/farmacia

Conflicts:
	farmacia.css