Changes to be committed:
	modified:   app/models/conditionModel.js
	modified:   app/models/contactModel.js
	modified:   app/models/medicationModel.js
	modified:   app/models/userModel.js
	modified:   app/models/vaccinationModel.js
	modified:   app/views/conditionView.js
	modified:   app/views/contactView.js
	modified:   app/views/medicationView.js
	modified:   app/views/myTestView.js
	new file:   app/views/showConditionView.js
	new file:   app/views/showContactView.js
	new file:   app/views/showMedicationView.js
	new file:   app/views/showVaccinationView.js
	modified:   app/views/vaccinationView.js
	modified:   index.html
Merge branch 'master' of https://github.com/hasnatahmed-nbs/myHealthApp

Conflicts:
	app/models/vaccinationModel.js

 Changes to be committed:
	modified:   app/models/vaccinationModel.js