3
Fr and ch
Merge branch 'master' of https://github.com/NiklasPhabian/EnergyMarket