Merge branch 'master' of https://github.com/darlacameron/national-security-zone-food

Conflicts:
	commodities/index.html
Source info and updated chatter/headlines
Fixing conflicts
Fixing conflicts
Conflicts. I am terrible at this...
Hoping I'm not breaking everything...