A conflict

The first line was deleted and replaced
Merge branch 'jenny'
Merge branch 'master' into jenny
Merge pull request #1 from jennybunny/jenny

Jenny