Merge branch 'master' of https://github.com/LucasFievet/Tomorrow

Conflicts:
	Publications/Forecasting  Future Oil Production/peak_oil.lyx~
dksfjsdkfj
Merge branch 'master' of https://github.com/LucasFievet/Tomorrow