[FIX] fixing merge error [FIX] fixing css for game header
[FIX] fixing merge error
[FIX] fixing css for game header

CapsHil/Projet_Web_2017_ESIEA,CapsHil/Projet_Web_2017_ESIEA,CapsHil/Projet_Web_2017_ESIEA