Merge branch 'master' of git.soton.ac.uk:ba1e12/fridayFagPackets

# Conflicts:
#	docs/GDP_emissions_trends.html
#	gdpAndEmissions/GDP_emissions_trends.html

Merge branch 'master' of git.soton.ac.uk:ba1e12/fridayFagPackets
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

pull master to Ben's fork

See merge request ba1e12/fridayFagPackets!1

Update gdp and emisisons

See merge request SERG/fridayFagPackets!15

added notes & updated plot labels

See merge request SERG/fridayFagPackets!14

changed to self-contained for github pages rendering

See merge request SERG/fridayFagPackets!13

updating

See merge request SERG/fridayFagPackets!12

moved to docs so git pages works

See merge request SERG/fridayFagPackets!11

add 2 ffps

See merge request SERG/fridayFagPackets!10

shifted some of the calcs to the makefile

See merge request SERG/fridayFagPackets!9