^                _|_
         | |              /   \
       @#####@            |\   \
     (###   ###)-.        | \   \
   .(###     ###) \        \ \   \
  /  (###   ###)   )        \ \   \
 (=-  .@#####@|_--"          \ \   \
 /\    \_|l|_/ (\             \ \   \
(=-\     |l|    /              \ \   \
 \  \.___|l|___/                \ \   \
 /\      |_|   /                |\ \   \
(=-\._________/\                | \ \   \
 \             /                | |\ \   \
   \._________/                 | | \ \   \
     #  ----  #                 \ |_|\ \   \
     #   __   #                  \  | \ \   \
     \########/                   \ |  \ \   \
                                   \|   \ \  _\
                                    |    \ \/ \
                                    |     \ |  |
                                    |     |\|__|
                                     \    |  |
                                      \   |  |
                                       \  |  |
                                        \ |  |
                                         \|__|
^                _|_
         | |              /   \
       @#####@            |\   \
     (###   ###)-.        | \   \
   .(###     ###) \        \ \   \
  /  (###   ###)   )        \ \   \
 (=-  .@#####@|_--"          \ \   \
 /\    \_|l|_/ (\             \ \   \
(=-\     |l|    /              \ \   \
 \  \.___|l|___/                \ \   \
 /\      |_|   /                |\ \   \
(=-\._________/\                | \ \   \
 \             /                | |\ \   \
   \._________/                 | | \ \   \
     #  ----  #                 \ |_|\ \   \
     #   __   #                  \  | \ \   \
     \########/                   \ |  \ \   \
                                   \|   \ \  _\
                                    |    \ \/ \
                                    |     \ |  |
                                    |     |\|__|
                                     \    |  |
                                      \   |  |
                                       \  |  |
                                        \ |  |
                                         \|__|
Merge branch 'master' of https://github.com/pidupuis/ProjetJEE.git
bidouille ring
fix conflict