extra info
Merge branch 'master' of https://github.com/jean-marc/kiosk_os