Really add armadillo
Merge https://github.com/Nabijaczleweli/Cpp-CGOL