update
Merge branch 'master' of https://github.com/showc7/the-game-of-life