Aymeric

src/Environment.cpp

+<<<<<<< HEAD
 #include "Environment.h"
 
 #include <cstdlib>
@@ -84,4 +85,4 @@ void Environment::setLife(int i){
     for (std::vector<Pet>::iterator it = pets.begin(); it != pets.end(); ++it) {
         it->setLife(i);
     }
-}
\ No newline at end of file
+}