2
Merge branch 'master' of https://github.com/HakureiMarisa/website

Conflicts:
	framework/component/Gif.js
Merge branch 'master' of https://github.com/HakureiMarisa/website
1