begin fixtures
Merge branch 'master' of https://github.com/FPierre/hackathon
datafixtures
Merge branch 'master' of https://github.com/FPierre/hackathon