Merge branch 'master' of https://github.com/oodabaga/museum_kiosk.git
Merge branch 'master' of https://github.com/oodabaga/museum_kiosk.git1