cleaned up, added cellular automaton
Merge remote-tracking branch 'origin/master'