carlos
Merge branch 'master' of https://github.com/teamtwenty/Lab2

carlos

Conflicts:
	HW.c