Completed Problem 55, also modified header guard usage in some included files