This is a commit in branch1!
Some more development in branch2!
Merge branch 'ettoreb/branch1' into ettoreb/branch2

Conflicts:
	GitTraining/GitTraining/src/main.c
Merge pull request #1 from EttoreBrtl/ettoreb/branch2

My first pull request