Merge branch 'master' of https://github.com/ZennoFact/ProjectKCG

Conflicts:
	css/login.css
	login.html
Image

Hikari’s file
test

test