commit pr01 1
Merge branch 'master' of https://github.com/jorgesales/test01

Conflicts:
	test.cpp
test 02
man01
Merge branch 'man01' of github.com:jorgesales/test01 into man01

Conflicts:
	test.cpp