commit to pull
Merge branch 'master' of github.com:CERE-CGE/funding

Conflicts:
	nuclear_phase_out/appendix_b.tex