add main method
dialogueのデータ
マシュマロ
fixed main.js
fixed main.js
mergeマシュマロ
accepted #25
Merge pull request #26 from asy524/naomi

Naomi
仮完成
Merge branch 'master' of https://github.com/asy524/2014SpringProject into naomi2
Merge pull request #27 from asy524/naomi

Naomi
鈴木7/7進捗、予定
検索エンジン追加
dialogu3の変更
api_key.php deleted
Merge pull request #28 from asy524/suzuki

Suzuki
Merge pull request #30 from asy524/yoshito

api_key.php deleted
Merge pull request #29 from asy524/kagawa

mp3ファイルの追加
7/14
鈴木くんと賀川くんの取り込み