Added first file
Changed a line
Merge branch 'master' of github.com:stralex7/myrepo