Merge pull request #1 from cwhite911/master

Data
Merge pull request #2 from cwhite911/master

Changes
Merge pull request #3 from cwhite911/master

Updates
added cooking oil data
new stuff
Added locations data
Updated data
New Stuff
Lots of new changes, still working on layout
Changed map size
Carbon Data