ふぁ
Merge branch 'master' of https://github.com/6cker845/finalReport

Conflicts:
	html/menhera.html
	menhera.js