first commit
first commit
first commit
first commit
firt commit
Merge branch 'master' of https://github.com/kivibot/GameOfLife

Conflicts:
	.gitignore