コメント機能実装
Merge branch 'master' of ssh://github.com/aq2bq/magi2

Conflicts:
	db/schema.rb