untracked file ignored
removing sphinx from version control
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone

Conflicts:
	db/sphinx/test/provider_delta.spa
	db/sphinx/test/provider_delta.spd
	db/sphinx/test/provider_delta.sph
	db/sphinx/test/provider_delta.spi
	db/sphinx/test/provider_delta.spp
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
drug_image url is added