very usefull commit
Merge branch 'master' of https://github.com/tszym/game-of-life

Conflicts:
	README.markdown