to learn about git.
Merge branch 'master' of https://github.com/abztrakt/git-practice
Caused a conflict, handled it.