hi
Merge branch 'master' of https://github.com/TeamSese/GameOfLife

Conflicts:
	src/com/teamSESE/gameOfLife/GameGUI.java
Merge branch 'master' of https://github.com/TeamSese/GameOfLife