Immunization controller completed with a few other changes
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'
fixed minor formatting issue with new ailment view
bp pretty