first test
Merge branch 'master' of https://github.com/bttung/game-of-life