Initial Commit
Merge https://github.com/mr-rampage/conway
Initial Merge