Added wltrimbl's recommendation
Added Will Trimble's recommendation
git log --oneline
Adding another dummy file
Trying to resolve conflict
Trying again
A great book
Merge pull request #10 from cavender/master

Some good books.