added CellularAutomata.h
merged stuff