Merge origin/master

Conflicts:
	main.c
	prueba
	y.tab.c
	y.tab.h
Merge origin/master

Conflicts:
	main.c
	prueba
	y.tab.c
	y.tab.h
Merge origin/master

Conflicts:
	lista.c
	main.c
Merge origin/master

Conflicts:
	lista.c
	main.c
Merge origin/master

Conflicts:
	y.tab.c
	y.tab.h
Merge origin/master

Conflicts:
	y.tab.c
	y.tab.h