Modifying trannoy.py
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge pull request #307 from benjello/dev

Dev