Leaves commit
Leaves commit 2
macbook 1
feature1
steve
Terry
sdada
sadsdad
something
nnoc
Merge remote-tracking branch 'origin/leaves' into leaves
some message
Messssss
xxxx
a
Messssss
Merge branch 'master' of https://github.com/screenm0nkey/test into master1

Conflicts:
	added copy.txt
Some new stuff
Merge remote-tracking branch 'origin/feature1' into feature1
trouble