fixed main.js
fixed main.js
accepted #25
Merge pull request #26 from asy524/naomi

Naomi
仮完成
Merge branch 'master' of https://github.com/asy524/2014SpringProject into naomi2