add te-ma
進捗などの記入
Merge pull request #20 from asy524/yoshito

add_dialogue3
Merge branch 'master' of https://github.com/asy524/2014SpringProject into kagawa
進捗記入の訂正
進捗記入の訂正
Update README.md
菅谷です
Merge pull request #21 from asy524/sugaya

菅谷です
sugaya
Merge pull request #22 from asy524/sugaya

sugaya
Merge branch 'master' of https://github.com/asy524/2014SpringProject into kagawa
7/7　進捗などの記入
7/7　進捗などの記入
7/7　進捗などの記入
Merge pull request #23 from asy524/kagawa

Kagawa
Merge pull request #24 from asy524/yoshito

環境変数に対応
api_key.php deleted