Merge branch 'master' of https://github.com/nutsiepully/medmanage
Readding files again?

Conflicts:
	src/org/vcs/medmanage/ResidentMedicineActivity.java
Merge branch 'master' of https://github.com/nutsiepully/medmanage
and... reverting back to old files to fix git hub again -_-