a
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
e
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
deplace guerrier temp
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration