first real commit
Merge pull request #1 from farva/first_branch

first real commit