Merge branch 'master' of https://github.com/visaharova/git-practise

# Conflicts:
#	song.txt