Revert "111"

This reverts commit 04c9bf061d5b28a405e740f071885a742615fcad.
Revert "revert shop2.html"

This reverts commit db336ac3d7972d99e3aa68e1cb1bf3ba62b04dcc.
Revert "11"

This reverts commit 160301ef437d42b603f30318639ca8917a35f61e.
svg
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/img/Description_icons.svg
	www/pages/shop.html