Milestone 3 commit
Merge branch 'master' of https://github.com/ntokozo-studio/POS_Project_M4