Garbage kiosk
Merge stuff
Merge branch 'master' of https://github.com/wfro/chui-hackfest
bs
Merge branch 'master' of https://github.com/wfro/chui-hackfest