テストです
Merge branch 'nishioka' of https://github.com/cs11002/reply-tree into tanaka
Merge remote-tracking branch 'origin/master' into tanaka
モーダル表示用のたどったリプライを表示しました
readmore機能追加
Merge commit '89635b18d6124d9c5bdd462159d408f4ff98b117' into nishioka

Conflicts:
	twitteroauth-master/html.inc
	twitteroauth-master/modal.php