Immunization controller completed with a few other changes
Merge branch 'master' of https://github.com/mmoniz/Capstone into moniz-master

Conflicts:
	app/controllers/allergies_controller.rb
	db/schema.rb