Kiosk changes

(Unfinalized)
Merge branch 'master' of https://github.com/james-dibble/Embedded-Systems-Assignment