before merge
Merge https://github.com/Skarlit/ShoppingDemo

important
Merge https://github.com/Skarlit/ShoppingDemo

asdfasd
Merge https://github.com/Skarlit/ShoppingDemo

fixed css
Merge https://github.com/Skarlit/ShoppingDemo

more bugs
conflict
conflict