initial commit
Merge branch 'master' of https://github.com/wceichelb/Conway

Sync remote and local repo