Merge branch 'master' of https://github.com/ARenaudeau/Economy
Updated pdf
Resolution of conflict.