Very simple, some stuff left to do.
Merge branch 'master' of github.com:gudmunduregill/conway