Pursuing work on 02_imput_loyer
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Pursuing on 02_imput_loyer, erf completed
temp commit before merge
Before transformation check_consistency
Done check_consistency 1.0
Fixed 05_foyer
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Evening commit
Lame commit
Delete R scories on 05_foyer and 08_final
Cleaned 02_imput, pursuing check_consistency
Fixing conflicts
Synchronising with Jerome
More synchronising before merge
fixing bug in "garantie de ressources"
Merge pull request #261 from bouxtehouve/dev

Pull request
modif in param
drop comments in param
Merge pull request #262 from bouvard/dev

Dev