first commit
Merge branch 'master' of https://github.com/i-smolina/Conway-Game-of-Life

Conflicts:
	.gitignore