//changes made in line 6
Merge branch 'master' of https://github.com/opobla/git-tutorial