diff --git a/.gitignore b/.gitignore
index 7e99e36..6245b64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-*.pyc
\ No newline at end of file
+app.db
+
+__pycache__/
+app/__pycache__/
diff --git a/app/templates/base/navbar.html b/app/templates/base/navbar.html
index c526f14..bd61bac 100644
--- a/app/templates/base/navbar.html
+++ b/app/templates/base/navbar.html
@@ -69,6 +69,7 @@
 	</ul>
 
 	<div id="menu">
+<<<<<<< HEAD
 		{% include "base/navbar/account.html" %}
 
 		{% include "base/navbar/news.html" %}
@@ -82,5 +83,247 @@
 		{% include "base/navbar/sprites.html" %}
 
 		{% include "base/navbar/tools.html" %}
+=======
+		{% if current_user.is_authenticated %}
+		<div>
+			<h2>
+				<img src="{{ url_for('static', filename= 'images/3864.png') }}">
+				{{ current_user.username }}
+			</h2>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M20,2A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H6L2,22V4C2,2.89 2.9,2 4,2H20M4,4V17.17L5.17,16H20V4H4M6,7H18V9H6V7M6,11H15V13H6V11Z"></path>
+				</svg>
+				Notifications
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M2,2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H2M4,4H6V6L6,11H4V4M18,4H20V11H18V6L18,4M8,6H16V11.5C16,13.43 15.42,15 12,15C8.59,15 8,13.43 8,11.5V6Z"></path>
+				</svg>
+				Trophées
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M12,15.39L8.24,17.66L9.23,13.38L5.91,10.5L10.29,10.13L12,6.09L13.71,10.13L18.09,10.5L14.77,13.38L15.76,17.66M22,9.24L14.81,8.63L12,2L9.19,8.63L2,9.24L7.45,13.97L5.82,21L12,17.27L18.18,21L16.54,13.97L22,9.24Z"></path>
+				</svg>
+				Topics favoris
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M3,1H19A1,1 0 0,1 20,2V6A1,1 0 0,1 19,7H3A1,1 0 0,1 2,6V2A1,1 0 0,1 3,1M3,9H19A1,1 0 0,1 20,10V10.67L17.5,9.56L11,12.44V15H3A1,1 0 0,1 2,14V10A1,1 0 0,1 3,9M3,17H11C11.06,19.25 12,21.4 13.46,23H3A1,1 0 0,1 2,22V18A1,1 0 0,1 3,17M8,5H9V3H8V5M8,13H9V11H8V13M8,21H9V19H8V21M4,3V5H6V3H4M4,11V13H6V11H4M4,19V21H6V19H4M17.5,12L22,14V17C22,19.78 20.08,22.37 17.5,23C14.92,22.37 13,19.78 13,17V14L17.5,12M17.5,13.94L15,15.06V17.72C15,19.26 16.07,20.7 17.5,21.06V13.94Z"></path>
+				</svg>
+				Panel d'administration
+			</a>
+
+			<hr />
+
+			<a href="account.html">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z"></path>
+				</svg>
+				Paramètres
+			</a>
+			<a href="{{ url_for('logout') }}">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M17,17.25V14H10V10H17V6.75L22.25,12L17,17.25M13,2A2,2 0 0,1 15,4V8H13V4H4V20H13V16H15V20A2,2 0 0,1 13,22H4A2,2 0 0,1 2,20V4A2,2 0 0,1 4,2H13Z"></path>
+				</svg>
+				Déconnexion
+			</a>
+		</div>
+		{% else %}
+		<div>
+			<h2>
+				Invité
+			</h2>
+			<form method="post" action="" class="login with-ajax">
+				{{ form.hidden_tag() }}
+				<p>
+	   				{{ form.username.label }}<br>
+					{{ form.username(size=32) }}<br>
+					{% for error in form.username.errors %}
+					<span style="color: red;">[{{ error }}]</span>
+					{% endfor %}
+					</p>
+					<p>
+					{{ form.password.label }}<br>
+					{{ form.password(size=32) }}<br>
+					{% for error in form.password.errors %}
+					<span style="color: red;">[{{ error }}]</span>
+					{% endfor %}
+	</p>
+	<p>{{ form.remember_me() }} {{ form.remember_me.label }}</p>
+	<p>{{ form.submit() }}</p>
+			</form>
+			<a href="{{ url_for('register') }}">Inscription</a>
+		</div>
+		{% endif %}
+
+		<div>
+			<h2>
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M20,11H4V8H20M20,15H13V13H20M20,19H13V17H20M11,19H4V13H11M20.33,4.67L18.67,3L17,4.67L15.33,3L13.67,4.67L12,3L10.33,4.67L8.67,3L7,4.67L5.33,3L3.67,4.67L2,3V19A2,2 0 0,0 4,21H20A2,2 0 0,0 22,19V3L20.33,4.67Z"></path>
+				</svg>
+				Actualités
+			</h2>
+			<a href="#">Casio</a>
+			<a href="#">Arduino</a>
+			<a href="#">Projets communautaires</a>
+			<a href="#">Divers</a>
+
+			<hr />
+
+			<h3>Derniers articles</h3>
+			<ul>
+				<li><a href="#">Un nouvel OS pour les Graph 75</a></li>
+				<li><a href="#">Les 7 Days CPC arrivent bientôt</a></li>
+				<li><a href="#">Résultats de jeu du mois de Février 2017</a></li>
+				<li><a href="#">Test du shield relai Sainsmart pour Arduino</a></li>
+				<li><a href="#">Un nouveau tutoriel sur le C-engine</a></li>
+			</ul>
+		</div>
+
+		<div>
+			<h2>
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M17,12V3A1,1 0 0,0 16,2H3A1,1 0 0,0 2,3V17L6,13H16A1,1 0 0,0 17,12M21,6H19V15H6V17A1,1 0 0,0 7,18H18L22,22V7A1,1 0 0,0 21,6Z"></path>
+				</svg>
+				Forum
+			</h2>
+			<a href="#">Vie communautaire</a>
+			<a href="#">Projets de programmation</a>
+			<a href="#">Questions et problèmes</a>
+			<a href="#">Discussions</a>
+			<a href="#">Administration</a>
+			<a href="#">CreativeCalc</a>
+
+			<hr />
+
+			<h3>Derniers commentaires</h3>
+			<ul>
+				<li><a href="#">Legolas</a> sur <a href="#">Bugs de la v5</a></li>
+				<li><a href="#">Dark Storm</a> sur <a href="#">fxSDK support</a></li>
+				<li><a href="#">Gollum</a> sur <a href="#">Le nom de topic qui fout le bordel car il est trop long…</a></li>
+				<li><a href="#">Lephenixnoir</a> sur <a href="#">fxSDK support</a></li>
+				<li><a href="#">Kristaba</a> sur <a href="#">FiXos, le retour</a></li>
+			</ul>
+		</div>
+
+		<div>
+			<h2>
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M8,3A2,2 0 0,0 6,5V9A2,2 0 0,1 4,11H3V13H4A2,2 0 0,1 6,15V19A2,2 0 0,0 8,21H10V19H8V14A2,2 0 0,0 6,12A2,2 0 0,0 8,10V5H10V3M16,3A2,2 0 0,1 18,5V9A2,2 0 0,0 20,11H21V13H20A2,2 0 0,0 18,15V19A2,2 0 0,1 16,21H14V19H16V14A2,2 0 0,1 18,12A2,2 0 0,1 16,10V5H14V3H16Z"></path>
+				</svg>
+				Programmes
+			</h2>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M7,6H17A6,6 0 0,1 23,12A6,6 0 0,1 17,18C15.22,18 13.63,17.23 12.53,16H11.47C10.37,17.23 8.78,18 7,18A6,6 0 0,1 1,12A6,6 0 0,1 7,6M6,9V11H4V13H6V15H8V13H10V11H8V9H6M15.5,12A1.5,1.5 0 0,0 14,13.5A1.5,1.5 0 0,0 15.5,15A1.5,1.5 0 0,0 17,13.5A1.5,1.5 0 0,0 15.5,12M18.5,9A1.5,1.5 0 0,0 17,10.5A1.5,1.5 0 0,0 18.5,12A1.5,1.5 0 0,0 20,10.5A1.5,1.5 0 0,0 18.5,9Z"></path>
+				</svg>
+				Jeux
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M19,19H5V8H19M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M16.53,11.06L15.47,10L10.59,14.88L8.47,12.76L7.41,13.82L10.59,17L16.53,11.06Z"></path>
+				</svg>
+				Utilitaires
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M21,16H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10V20H8V22H16V20H14V18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2Z"></path>
+				</svg>
+				Logiciels
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M12,15.39L8.24,17.66L9.23,13.38L5.91,10.5L10.29,10.13L12,6.09L13.71,10.13L18.09,10.5L14.77,13.38L15.76,17.66M22,9.24L14.81,8.63L12,2L9.19,8.63L2,9.24L7.45,13.97L5.82,21L12,17.27L18.18,21L16.54,13.97L22,9.24Z"></path>
+				</svg>
+				Top 20
+			</a>
+
+			<hr />
+
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
+				</svg>
+				Recherche avancée
+			</a>
+
+			<hr />
+
+			<h3>Sélection de la semaine</h3>
+			<ul>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/fruit_ninja.gif') }}">Fruit Ninja</a></li>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/clonelab.gif') }}">Clonelab</a></li>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/gravity_duck.png') }}">Gravity Duck</a></li>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/calcraft.gif') }}">Calcraft</a></li>
+			</ul>
+
+			<hr />
+			<h3>Coup de cœur</h3>
+			<ul>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/fruit_ninja.gif') }}">Fruit Ninja</a></li>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/clonelab.gif') }}">Clonelab</a></li>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/gravity_duck.png') }}">Gravity Duck</a></li>
+				<li><a href="#"><img src="{{ url_for('static', filename = 'images/calcraft.gif')}}">Calcraft</a></li>
+			</ul>
+		</div>
+
+		<div>
+			<h2>
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M12,3L1,9L12,15L21,10.09V17H23V9M5,13.18V17.18L12,21L19,17.18V13.18L12,17L5,13.18Z"></path>
+				</svg>
+				Tutoriels
+			</h2>
+			<a href="#">Basic Casio</a>
+			<a href="#">C/C++ Casio</a>
+			<a href="#">Arduino</a>
+			<hr>
+			<a href="#">Foire aux questions (FAQ)</a>
+		</div>
+
+		<div>
+			<h2>
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M20.71,4.63L19.37,3.29C19,2.9 18.35,2.9 17.96,3.29L9,12.25L11.75,15L20.71,6.04C21.1,5.65 21.1,5 20.71,4.63M7,14A3,3 0 0,0 4,17C4,18.31 2.84,19 2,19C2.92,20.22 4.5,21 6,21A4,4 0 0,0 10,17A3,3 0 0,0 7,14Z"></path>
+				</svg>
+				Sprites
+			</h2>
+			<a href="#">Personnages</a>
+			<a href="#">Environnement</a>
+			<a href="#">Objets</a>
+			<a href="#">Interfaces</a>
+			<a href="#">Générateur</a>
+		</div>
+
+		<div>
+			<h2>
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M22.7,19L13.6,9.9C14.5,7.6 14,4.9 12.1,3C10.1,1 7.1,0.6 4.7,1.7L9,6L6,9L1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1C4.8,14 7.5,14.5 9.8,13.6L18.9,22.7C19.3,23.1 19.9,23.1 20.3,22.7L22.6,20.4C23.1,20 23.1,19.3 22.7,19Z"></path>
+				</svg>
+				Outils
+			</h2>
+
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M2.6,10.59L8.38,4.8L10.07,6.5C9.83,7.35 10.22,8.28 11,8.73V14.27C10.4,14.61 10,15.26 10,16A2,2 0 0,0 12,18A2,2 0 0,0 14,16C14,15.26 13.6,14.61 13,14.27V9.41L15.07,11.5C15,11.65 15,11.82 15,12A2,2 0 0,0 17,14A2,2 0 0,0 19,12A2,2 0 0,0 17,10C16.82,10 16.65,10 16.5,10.07L13.93,7.5C14.19,6.57 13.71,5.55 12.78,5.16C12.35,5 11.9,4.96 11.5,5.07L9.8,3.38L10.59,2.6C11.37,1.81 12.63,1.81 13.41,2.6L21.4,10.59C22.19,11.37 22.19,12.63 21.4,13.41L13.41,21.4C12.63,22.19 11.37,22.19 10.59,21.4L2.6,13.41C1.81,12.63 1.81,11.37 2.6,10.59Z"></path>
+				</svg>
+				Forge GitLab
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M14.97,18.95L12.41,12.92C11.39,14.91 10.27,17 9.31,18.95C9.3,18.96 8.84,18.95 8.84,18.95C7.37,15.5 5.85,12.1 4.37,8.68C4.03,7.84 2.83,6.5 2,6.5C2,6.4 2,6.18 2,6.05H7.06V6.5C6.46,6.5 5.44,6.9 5.7,7.55C6.42,9.09 8.94,15.06 9.63,16.58C10.1,15.64 11.43,13.16 12,12.11C11.55,11.23 10.13,7.93 9.71,7.11C9.39,6.57 8.58,6.5 7.96,6.5C7.96,6.35 7.97,6.25 7.96,6.06L12.42,6.07V6.47C11.81,6.5 11.24,6.71 11.5,7.29C12.1,8.53 12.45,9.42 13,10.57C13.17,10.23 14.07,8.38 14.5,7.41C14.76,6.76 14.37,6.5 13.29,6.5C13.3,6.38 13.3,6.17 13.3,6.07C14.69,6.06 16.78,6.06 17.15,6.05V6.47C16.44,6.5 15.71,6.88 15.33,7.46L13.5,11.3C13.68,11.81 15.46,15.76 15.65,16.2L19.5,7.37C19.2,6.65 18.34,6.5 18,6.5C18,6.37 18,6.2 18,6.05L22,6.08V6.1L22,6.5C21.12,6.5 20.57,7 20.25,7.75C19.45,9.54 17,15.24 15.4,18.95C15.4,18.95 14.97,18.95 14.97,18.95Z"></path>
+				</svg>
+				Casio Universal Wiki
+			</a>
+			<a href="#">
+				<svg viewBox="0 0 24 24">
+					<path fill="#ffffff" d="M19,8L15,12H18A6,6 0 0,1 12,18C11,18 10.03,17.75 9.2,17.3L7.74,18.76C8.97,19.54 10.43,20 12,20A8,8 0 0,0 20,12H23M6,12A6,6 0 0,1 12,6C13,6 13.97,6.25 14.8,6.7L16.26,5.24C15.03,4.46 13.57,4 12,4A8,8 0 0,0 4,12H1L5,16L9,12"></path>
+				</svg>
+				SH4 Compatibility Tool
+			</a>
+		</div>
+>>>>>>> v5_flask
 	</div>
 </nav>