conflict on test?
Merge branch 'chapter-two' of https://github.com/snormann/GitInPractice into chapter-two
conflict from main directory?
conflicts resolved