Add content to #index action in home_controller.rb file. Write function to retrieve json data in map.js file.
Merge remote-tracking branch 'upstream/master'
Take chunk of code from AmCharts.ready(function) and put inside new makeMap function. Edit stateInfo to be function rather than a function stored as a variable. Write createStateDescriptions function. Able to get barrels of oil data from table and make it available to the map.
fixed conflicts after merge