Changed color
Merge branch 'master' of github.com:letharion/git-learning
Resolved conflict
Merge branch 'master' of github.com:letharion/git-learning