More functionality.
Merge branch 'master' of github.com:drt2009/SubwayKiosk