avances
qgMerge branch 'master' of https://github.com/MarthaOrtiz/hw_7

Conflicts:
	IC.c
avances