Successfully implemented the add pre-made option.
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers.rb
	views/make_choices.erb