// Setup outline for parent function
// added my portion of the parent function
Update project5.c
Update project5.c

Changing parent function to have a parameter of the child id
adding name
Update project5.c
Merge branch 'parentcrs' into parent

Conflicts:
	project5.c
// I think it's all good to go from here, had a hard merge
Adding last bits to finish up parent