Merge branch 'grid-world' of https://git.unicaen.fr/bruno.mermet/mad-framework into grid-world

src/main/java/fr/greyc/mad/framework/example/gridworld/GridWorldAgentBody.java

 package fr.greyc.mad.framework.example.gridworld;
 
-import java.util.List;
 import java.util.LinkedList;
+import java.util.List;
 
 import fr.greyc.mad.framework.model.Action;
 import fr.greyc.mad.framework.model.AgentBody;
@@ -15,8 +15,14 @@ import fr.greyc.mad.framework.model.Observation;
  */
 public class GridWorldAgentBody implements AgentBody {
 
-	List<Action> actions;
+	/** The list of actions of this agent. */
+	private final List<Action> actions;
 
+	/**
+	 * Builds a new instance.
+	 * 
+	 * @param factory A factory of actions
+	 */
 	public GridWorldAgentBody(GridWorldActionFactory factory) {
 		List<Action> list = new LinkedList<Action>();
 		list.add(factory.get(this, -1, 0)); // left

src/main/java/fr/greyc/mad/framework/example/gridworld/package-info.java

 /**
  * A package for a simple grid world environment, with agents able to move from squares to neighboring squares.
  * 
+<<<<<<< HEAD
  * @author Bruno Zanuttini, Université de Caen Normandie, France
+=======
+ * @author Bruno Zanuttini
+>>>>>>> 81b1b235bb180608bfdac31558e4af1a95055b18
  */
 package fr.greyc.mad.framework.example.gridworld;
\ No newline at end of file