merge conflict text
Merge branch 'master' of https://github.com/elliemdaw/firstRepoEver

Partner edited and I edited before I pulled his changes.