更に訂正
Merge branch 'master' of https://github.com/c-plus-c/cojt-assignment1

Conflicts:
	js/matrixengine-contents.js
	js/matrixengine-controller-skeleton.js