combined code
Merge branch 'master' of https://github.com/raspiz/FuturePOS-Challenge