Implemented doxygen commenting for both C++ and Python source code.
Merged source code
Fixed bug causing segmentation fault for HW4.