something
Merge branch 'master' of https://github.com/eecs183/gameOfLife
stuff