commit
Delete DietFragment.java
Delete ExerciseFragment.java
Delete HomeFragment.java
Delete MedicationFragment.java
Delete ReportsFragment.java
Delete VitalSignsFragment.java
Delete strings_activity_login.xml
Create MedicationFragment.java
Update MedicationFragment.java
commit
retrieve db entries example included
bug fixes
bug fixes
Merge branch 'master' of https://github.com/UTASoftwareEngineering2014/HealthNow

Conflicts:
	AndroidManifest.xml
	res/layout/fragment_diet.xml
Merge branch 'master' of https://github.com/UTASoftwareEngineering2014/HealthNow