dunno
Merge github.com:gkrnours/4IF06 into HEAD

Conflicts:
	src/life/LIFE.java
updated lif