first commit
added license
Merge branch 'master' of https://github.com/silvertale/Conway-s-Game-Of-Life

Conflicts:
	LICENSE
	README.md
Fixed merges.