some staff
Merge branch 'master' of github.com:Houd1ny/GameOfLife