Merge branch 'Payment' of github.com:Frozen2006/shopProject
Merge branch 'master' of github.com:Frozen2006/shopProject
Errors after merging correct