Merge branch 'master' of git@github.com:ManilaADM/medicine-inventory.git

Conflicts:
	README