commit stuff before merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/map.js
Add new function to save original table data that can be accessed after a state description shows up.
Edit tag in description.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/map.js
Able to update barrels of oil displays in window after clicking on calculate button.
merged