second deleted
first deleted
first.txt and second.txt are added
first removed
Merge branch 'new'

Conflicts:
	first.txt
second deleted
first added
first.txt modified
first removed
last commit
Merge branch 'master' of https://github.com/Djimi/Example