Add a "Conway's Game of Life" effect to the project.
Merge pull request #8 from cparkins/master

Add a "Conway's Game of Life" effect to the project.
adding game of life. fixing conflicts