Populate upcoming medication on Resident Profile page. Also recent
residents get added.
gitignore on .classpath and .project.
Solving conflict so I can push...
Solving another conflict so I can push...
Merge branch 'master' of https://github.com/nutsiepully/medmanage.git

Conflicts:
	.classpath
	.project
	src/org/vcs/medmanage/ResidentMedicineActivity.java
Merge branch 'master' of https://github.com/nutsiepully/medmanage.git

Conflicts:
	.classpath
	.project