Signed-by: victormedel<victor.medel@roadrunner.com>
Merge branch 'master' of https://github.com/victormedel/MedelVictor_CSC11_48598

Conflicts:
	Homework/assign3c