initial
Merge pull request #1 from n-katoh131/master20140901

initial 最新のmasterをマージ