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

Conflicts:
	formas_2014/formas_2014.tex