#6
Merge pull request #21 from git-training-20140901/issues/6_katagiri-intro

#6