merging
Merge branch 'master' of https://github.com/gkrnours/4IF06.git

Conflicts:
	src/life/LIFE.java