adding classes

Allergy, Medication, Surgery
Adding Classes
Merge branch 'master' of https://github.com/health20houston/medform.me

Conflicts:
	model/contactdata.py
Merge branch 'master' of https://github.com/health20houston/medform.me

Conflicts:
	model/contactdata.py