Everything in one place
Merge branch 'master' of https://github.com/medovamx/GameOfLife

Conflicts:
	Java src/gameOfLife/src/cell.java
	Java src/gameOfLife/src/grid.java