Merge pull request #2 from benjello/master

fix typo and transitional bugs
.gitignore is now working
Merge branch 'master' of https://github.com/openfisca/ga

Conflicts:
	src/lib/cohorte.py
Merge branch 'master' of https://github.com/openfisca/ga

Conflicts:
	src/lib/simulation.py
	src/lib/utils.py
add an __init__.py
additional test
modification 24/04/2013

expanding cohorte .py and test_ga
new try to sync
Merge branch 'master' of https://github.com/jsantoul/ga

Conflicts:
	src/lib/cohorte.py
	src/scripts/test_ga.py
Merge pull request #7 from jsantoul/master

working on test_ga tax_proj