updated
Merge branch 'master' of github.com:pushpress/kiosk