edited whilst file was open
Merge remote-tracking branch 'origin/master'

Conflicts:
	Plugins/Test.txt