Second nonconflicted merge example
Merge branch 'master' of github.com:jamespjh/jh-ucl-swcarpentry-answers