fixed formatting
Merge branch 'master' of github.com:andrewazores/conway