UTF-8
Merge branch 'master' of github.com:palkeo/projet-jee