pinfo.c and testing program and script
Merge branch 'master' of https://github.com/deadlypanda4/osp

Conflicts:
	pinfo.c
	test.c
formatting to test.c was off