attention aux merges
Merge branch 'master' of https://github.com/brendiche/opizzalou
style update