Merge pull request #14 from 1919kemao9/20141108_02

text edit
Merge branch 'development' of https://github.com/1919kemao9/1919kemao9 into development
20141113 edit
Merge pull request #15 from 1919kemao9/20141113

20141113