First commit
Second commit
Merge branch 'master' of github.com:yazid5/kino
conflict fixed