Merge branch 'new_master' of https://github.com/josh23941/POSProject.git into new_master