edition bacs
Merge branch 'design' of github.com:ellis2323/dezordre into design