中間報告
Merge branch 'master' into hasegawa_1

Conflicts:
	js/item.js
	js/wall.js
Merge pull request #4 from ymon/hasegawa_1

中間報告