I'm pedantic.
Finished manual merge.
I'm running out of variations of "I hate merge" commit messages.
Merge branch 'master' into parttwo

Conflicts:
	list.c
	list.h

Final merge fix?