Add a third line
Merge branch 'master' of https://github.com/bjanell/testgit