fix popcorn quantities
Merge branch 'bridge_fix' of https://github.com/Wuzzy2/Cataclysm-DDA into doublemerge
undo extra files
Merge pull request #7375 from bug-sniper/fix_salted_popcorn

fix popcorn quantities
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into MutationTweaks
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod
Merge remote-tracking branch 'KA101/MutationTweaks' into FrankenMod
Don't want them here.