Added chapter 2
moving the lines around
fixed that merge conflict like a boss
moving the lines around
Merge branch 'master' of github.com:L1fescape/git-test
Added book 2
chapters
Merge branch 'master' of github.com:L1fescape/git-test
Added chapter 10 - Book 2