Revert "changed compiler to g++ in Makefile (from colorgcc)"

This reverts commit f126e1934fb762b3b845cd876d7fb268821aedfd.
Revert "Reworking the matrix class - build broken"

This reverts commit fe71b77e0ed795bdfd4e34b052326a90c37c80a7.