jkhh
Merge branch 'master' of https://github.com/lazopard/CS240

Conflicts:
	lab5/list.c