del pom.xml~
Merge branch 'master' of https://github.com/sunshawn16/ShoppingProject