Changed CircularList.h
Fixed Merge conflicts in CircularList.h