edit firstfile
delete char from firstfile
Merge branch 'newb'

Conflicts:
	firstfile
edit firstfile
edit again firstfile
random edit file firstfile
edi fff
edit secondfile
merge yo intomaster
edit secondfile
change centre
modified second