fix saint pierre
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
fix time pierre et miquelon
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
cams
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
Merge branch 'master' of https://github.com/soixantecircuits/mjpeg-wishes
fix conflicts