first commit #5
Merge pull request #17 from git-training-20140918/issues/5_intro-tabatakz

first commit #5