changed some variable names
Merge branch 'master' of https://github.com/dx2/GameOfLife