更新
Merge branch 'master' of https://github.com/KA-FU-/othello2

Conflicts:
	css/prototype-style.css
	html/prototype-index.html