first dummy program
Merge branch 'master' of https://github.com/mbarraco/basic-cpp

Conflicts:
	main.cpp
z

Signed-off-by: MarianoBarraco <marianobarraco@gmail.com>