Changed the name of the variable for num of args with a second name
to be used in the name-second branch of the repo.
Add of another comment that only appears in the name-second branch
and not on master
Added a var int num = 1 in src/main.cpp
Added a int num = 2 in src/main.cpp
Cambio
Merge branch 'name-second'

Conflicts:
	src/main.cpp

Solved the conflict by picking just the new value for the
intializing variable num = 2 (version of name-second)
Remove a line
Merge branch 'name-second'
Added three consecutive lines. One is only valid for name-second
while the next coment and line will be merged into master
Something expected
Merge branch 'name-second'

Conflicts:
	src/main.cpp

The adaptation has been made manually. There was a line
that should be merged and it was, so manually was deleted