文字
Merge branch 'master' of https://github.com/6cker845/finalReport

Conflicts:
	js/menhera.js