Some small changes
Merge branch 'master' of https://github.com/cheukyin699/gol

Conflicts:
	.gitignore
	gol.py
Work done