Merge branch 'master' of C:\Users\Michael\Documents\(12) School\Dropbox\Education\Westport Public Schools\12th Grade\Software Development S2\rubymine\sandwiches with conflicts.
Fixed bug where the prepared items did not populate properly on the supplies page.