status fix
Merge branch 'master' of https://github.com/Frozen2006/shopProject
Merge branch 'master' of https://github.com/Frozen2006/shopProject
views have been updated