First Commit
	new file:   primo
	new file:   secondo
Minor change
	modified:   secondo
New file to test
	new file:   terzo
Add some row
	modified:   terzo
Add Prologue
	modified:   terzo
Add new file call quarto like fourth
	new file:   quarto
Merge branch 'developer'
Index file
	new file:   index
Minor Change
	modified:   secondo
	modified:   terzo
Add some rows to primo
Add one special row to second
	modified:   primo
	modified:   secondo
Add simple rows in the beginning
	modified:   primo
Merge branch 'Developer'

Conflicts:
	secondo SOLVED WITHOUT PANIC
	modified:   primo
Merge remote-tracking branch 'origin/master'