base 3ème version
Merge branch 'database' of https://github.com/Tydax/Nuit-de-l-info-2014-ChocoLicornes into database