Intentional conflict
Merge branch 'master' of github.com:saralaoui/EGPC