k
Merge branch 'master' of https://github.com/kaiundcarina/ShopWindowControl

Conflicts:
	index.html
animation
Merge branch 'master' of https://github.com/kaiundcarina/ShopWindowControl