add te-ma
Merge branch 'master' of https://github.com/asy524/2014SpringProject into kagawa
Merge pull request #8 from asy524/kagawa

Kagawa