merge
Merge branch 'master' of https://github.com/unekwu/cs_nemesis
merged
Conflicts:
	cpsc360/l3.c
	cpsc360/l3.h