nix
Merge branches 'master' and 'master' of https://github.com/kaiundcarina/ShopWindowControl

Conflicts:
	details.html
slide left right
Merge branch 'master' of https://github.com/kaiundcarina/ShopWindowControl