test6
Merge branch 'master' of https://github.com/Thunderstick-Android-Project/Thunderstic-medicare

Conflicts:
	MedReminder/bin/R.txt