layout update
merge
Merge branch 'master' of github.com:jpecht/life-game