linklist.c
Merge branch 'master' of https://github.com/bear34188/software

Conflicts:
	linklist.c