update
Merge branch 'master' of github.com:SyntaxChris/Game-of-Life