Testing diff command.
changed master
Merge branch 'testbranch'

Conflicts:
	README
master merge change
changes to testbranch
Merge branch 'testbranch'

Conflicts:
	README