something happened
Merge branch 'master' of https://github.com/affo/game_of_life