second commit
Merge https://github.com/sad301/jkiosk-server