Test - breaking change
Merge branch 'master' of github.com:creedelambard/game-of-life

Conflicts:
	.gitignore

Updating .gitignore