Medications updated
medications migration
fixed bug in allergies: didn't populate info when editing
Immunization controller completed with a few other changes
Merge pull request #27 from DennisMarcu/master

fixed appointments and dentals
pretty bglucoses index
pretty bglucose show
pretty bglucose edit
modified bglucose: btype to string and added dropdown to create records
added honorific column to contacts
made appointments and medications pull only DOCTORS from contacts list
resolving conflicts
fixed merge conflicts and restored broken functionality to appointments
Merge pull request #28 from AdamAxtmann/master

Medications
added active field to sample data
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/mmoniz/Capstone into moniz-master

Conflicts:
	app/controllers/allergies_controller.rb
	db/schema.rb
fix small redirect bug with 'cancel create appointment'
new sync
synced fetch