.gitignore
Merge branch 'master' of github.com:tknhs/LifeGame into tknhs

Conflicts:
	.gitignore