Change to file that'll be deleted
Merge branch 'master' of https://github.com/Paul-Vincent/gitTest

Conflicts:
	shortLivedFile.txt
Merge branch 'master' of https://github.com/Paul-Vincent/gitTest
Merge branch 'master' of https://github.com/Paul-Vincent/gitTest
Non conflicting change