task 2.1 complete
Merge branch 'master' of https://github.com/Rebing/POS