v = 2
v = 2
Merge branch 'master' of https://github.com/jkero/jk_newbie

Conflicts:
	test01.txt
monte a 4