diff --git a/.classpath b/.classpath
index 2acdaef..4857be4 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry excluding="src/main/java/" kind="src" path=""/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/.project b/.project
index 3a8e878..97e34db 100644
--- a/.project
+++ b/.project
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ntr</name>
+	<name>ntr-tp</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+<<<<<<< HEAD
 	</buildSpec>
 	<natures>
+=======
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+>>>>>>> 1f69210e29fd09c28a55c7d4378f949f125d4bbc
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1677838833533</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/src/main/java/fr/ntr/scheduler/ProportionalFair.java b/src/main/java/fr/ntr/scheduler/ProportionalFair.java
new file mode 100644
index 0000000..1e0b650
--- /dev/null
+++ b/src/main/java/fr/ntr/scheduler/ProportionalFair.java
@@ -0,0 +1,33 @@
+package fr.ntr.scheduler;
+
+import java.util.List;
+
+import fr.ntr.User;
+
+public class ProportionalFair extends Scheduler {
+
+		private String name;
+		private int index;
+		
+		public ProportionalFair(String name, int index) {
+			this.name = name;
+			this.index = index;
+		} 
+		
+		@Override
+		public void scheduling() {
+		}
+			
+		private void selectionUtilisateur(int Ts, int Sp, List<User> Users) {
+			
+		}
+
+		@Override
+		protected void TraitementDonnées() {
+			// TODO Auto-generated method stub
+			
+		}
+
+		
+		
+}