more junit
Merge branch 'master' of https://github.com/gkrnours/4IF06

Conflicts:
	src/life/LIFE.java
Junit modification and UML
...
Merge branch 'master' of https://github.com/gkrnours/4IF06.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs