made gitignore actually work
Merge branch 'master' of https://github.com/ethan2014/conway