Altering the triangle_and_quad_input.txt and fix a bug in CG.cpp
Refactoring CG.cpp and altering type of input_file