asa
Merge branch 'master' of https://github.com/sergioandrescs/COTRINOMARTINEZ_HW6

Conflicts:
	SODE.c