diff --git a/pokemon b/pokemon
new file mode 160000
index 0000000..8147e64
--- /dev/null
+++ b/pokemon
@@ -0,0 +1 @@
+Subproject commit 8147e64108216ba18cc7d1b73be0530dcf265f1a
diff --git a/project/assets/html/includes/head.html b/project/assets/html/includes/head.html
index 47b3613..41743f7 100644
--- a/project/assets/html/includes/head.html
+++ b/project/assets/html/includes/head.html
@@ -1,5 +1,5 @@
 <head>
-	<meta charset="utf-8" />
+	<meta charset="UTF-8" /> 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<title>Page Title</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
diff --git a/project/assets/html/includes/header.html b/project/assets/html/includes/header.html
index d170e6b..bde03e1 100644
--- a/project/assets/html/includes/header.html
+++ b/project/assets/html/includes/header.html
@@ -5,9 +5,9 @@
                 <div class="row">
                     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
                         <ul>
-                            <a><li class="item_nav_imie" >Accès Net-Yparéo</li></a>
+                            <a><li class="item_nav_imie" >Acc�s Net-Ypar�o</li></a>
                             <a><li class="item_nav_imie" >IMIE Drones & Data</li></a>
-                            <a><li class="item_nav_imie" >IMIE Numérique</li></a>
+                            <a><li class="item_nav_imie" >IMIE Num�rique</li></a>
                             <a><li class="item_nav_imie" ><img id="twi" src="assets/img/twitter.png"></li></a>
                             <a><li class="item_nav_imie" ><img id="fb" src="assets/img/facebook.png"></li></a>
                         </ul>
@@ -22,7 +22,7 @@
                 <div class="row">
                     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
                         <ul>
-                            <a><li class="item_nav_blog_gauche" >Accès Net-Yparéo</li></a>
+                            <a><li class="item_nav_blog_gauche" >Acc�s Net-Ypar�o</li></a>
                             <a><li class="item_nav_blog_droite"><img id="glass" src="assets/img/glass.png"></li></a>
                             <a><li class="item_nav_blog_droite"><input id="search" type="text"></li></a>
                         </ul>
diff --git a/project/assets/html/index.html b/project/assets/html/index.html
index 828736d..a626e90 100644
--- a/project/assets/html/index.html
+++ b/project/assets/html/index.html
@@ -12,4 +12,5 @@
 		</footer>
 		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	</body>
-</html>
\ No newline at end of file
+</html>
+<!-- � -->
\ No newline at end of file
diff --git a/project/assets/html/oet.html b/project/assets/html/oet.html
new file mode 100644
index 0000000..a626e90
--- /dev/null
+++ b/project/assets/html/oet.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+	<body>
+		<header>
+			<tag type="includes" file="header" />
+		</header>
+
+		<footer>
+			<tag type="includes" file="footer" />
+		</footer>
+		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	</body>
+</html>
+<!-- � -->
\ No newline at end of file
diff --git a/project/assets/html/poet.html b/project/assets/html/poet.html
new file mode 100644
index 0000000..c1628a1
--- /dev/null
+++ b/project/assets/html/poet.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+	<body>
+		<header>
+			<tag type="includes" file="header" />
+		</header>
+
+		<footer>
+			<tag type="includes" file="footer" />
+		</footer>
+		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	</body>
+</html>
+<!-- 
\ No newline at end of file
diff --git a/project/assets/php/handler.php b/project/assets/php/handler.php
index 823d8b5..dfb5c5f 100644
--- a/project/assets/php/handler.php
+++ b/project/assets/php/handler.php
@@ -5,11 +5,15 @@
 
 $_GET['page'] = trim($_GET['page'], '/');
 $_GET['page'] = explode('/', $_GET['page'])[0];
-if($_GET['page'] == '') $_GET['page'] = 'index';
+if($_GET['page'] == '') {
+	$_GET['page'] = 'index';
+}
 
 // var_dump($_POST);
 // var_dump($_GET);
 
 include_once "tagHandler.php";
-$file = file_get_contents("../html/".$_GET["page"].".html");
-echo loadTags($file, false);
\ No newline at end of file
+$pokemon = loadTags("../html/".$_GET["page"].".html", false);
+$pokemon = mb_convert_encoding($pokemon, "utf-16");
+echo $pokemon;
+// echo mb_convert_encoding($pokemon, "ascii");
diff --git a/project/assets/php/tagHandler.php b/project/assets/php/tagHandler.php
index 1e6d708..669e132 100644
--- a/project/assets/php/tagHandler.php
+++ b/project/assets/php/tagHandler.php
@@ -93,6 +93,9 @@ class article extends tag {
 	}
 }
 
+/**
+ *  return element is user
+ */
 class isLoggedIn extends tag {
 	public function render() {
 		
@@ -222,7 +225,6 @@ class loop extends tag {
 		while ($loop->length >= 1 && !$this->isDebugging()) {
 			$loop[0]->parentNode->removeChild($loop[0]);
 		}
-
 	}
 }
 
@@ -231,9 +233,9 @@ function appendHTML(DOMNode $parent, $source) {
 	$html = "<html><body>";
 	$html .= $source;
 	$html .= "</body></html>";
-	$tmpDoc->loadHTML ($html);
+	$tmpDoc->loadHTML($html);
 	foreach ($tmpDoc->getElementsByTagName('body')->item(0)->childNodes as $node) {
-		$importedNode = $parent->ownerDocument->importNode ($node, true);
+		$importedNode = $parent->ownerDocument->importNode($node, true);
 		$parent->appendChild($importedNode);
 	}
 }
@@ -245,7 +247,7 @@ function appendHTML(DOMNode $parent, $source) {
 function loadTags($ctnt, $debug) {
 	$dom = new DOMDocument();
 	libxml_use_internal_errors(true);
-	$dom->loadHTML($ctnt);
+	$dom->loadHTMLFile($ctnt);
 	libxml_clear_errors();
 	$list = $dom->getElementsByTagName("tag");
 
diff --git a/project/assets/php/tag.txt b/project/assets/php/tags.txt
similarity index 100%
rename from project/assets/php/tag.txt
rename to project/assets/php/tags.txt
diff --git a/project/phpcs.xml b/project/phpcs.xml
new file mode 100755
index 0000000..f17e302
--- /dev/null
+++ b/project/phpcs.xml
@@ -0,0 +1,14 @@
+<ruleset name="mine">
+	<description>pouet</description>
+	<rule ref="PSR2">
+		<exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine"/>
+		<exclude name="Generic.WhiteSpace.DisallowTabIndent.TabsUsed"/>
+		<exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine"/>
+		<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses"/>
+		<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
+		<exclude name="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore" />
+		<exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
+	</rule>
+	
+
+</ruleset>
\ No newline at end of file
