implementacionopngl1
Merge branch 'master' of https://github.com/PSMoviles/Farmacy

Conflicts:
	src/com/psm/farmacy/HomeActivity.java