Changed :D
add
removed file
asdf file
Merge branch 'fred'
changed
Merge branch 'fred'
new file
added an add
added mental stuff
Merge branch 'fred'

Conflicts:
	stuff.txt