Two: one more file
Merge branch 'master' of github.com:zaletniy/git