final commit
Merge branch 'master' of https://github.com/scaperoth/POSproject
Merging changes from remote repo