Llenando la tabla de signos
Merge origin/master

Conflicts:
	main.c
	nbproject/private/private.xml