diff --git a/TODO b/TODO
index 1fb4f90..dbdadb7 100755
--- a/TODO
+++ b/TODO
@@ -4,6 +4,7 @@
 * remember me
 * Display names
 * htmlspecialchars => on users objects
+* Associate a guest with someone
 
 install.php :
 =============
diff --git a/tmp/connexion.af3906cfde643ae7f290cfdc51cc9342.rtpl.php b/tmp/connexion.af3906cfde643ae7f290cfdc51cc9342.rtpl.php
index 17712a4..ffdc588 100644
--- a/tmp/connexion.af3906cfde643ae7f290cfdc51cc9342.rtpl.php
+++ b/tmp/connexion.af3906cfde643ae7f290cfdc51cc9342.rtpl.php
@@ -8,3 +8,6 @@
     <p><label for="password" class="label-block">Password : </label><input type="password" name="password" id="password"/></p>
     <p><input type="submit" value="Connect"/></p>
 </form>
+
+<?php $tpl = new RainTPL;$tpl_dir_temp = self::$tpl_dir;$tpl->assign( $this->var );$tpl->draw( dirname("footer") . ( substr("footer",-1,1) != "/" ? "/" : "" ) . basename("footer") );?>
+
diff --git a/tmp/edit_users.af3906cfde643ae7f290cfdc51cc9342.rtpl.php b/tmp/edit_users.af3906cfde643ae7f290cfdc51cc9342.rtpl.php
new file mode 100644
index 0000000..fa3734e
--- /dev/null
+++ b/tmp/edit_users.af3906cfde643ae7f290cfdc51cc9342.rtpl.php
@@ -0,0 +1,70 @@
+<?php if(!class_exists('raintpl')){exit;}?><?php $tpl = new RainTPL;$tpl_dir_temp = self::$tpl_dir;$tpl->assign( $this->var );$tpl->draw( dirname("header") . ( substr("header",-1,1) != "/" ? "/" : "" ) . basename("header") );?>
+
+
+<?php if( $error != '' ){ ?>
+
+    <p class="error"><?php echo $error;?></p>
+<?php } ?>
+
+
+<?php if( $view == 'list_users' ){ ?>
+
+<h2>List of users</h2>
+<p>You can also <a href="?do=add_user">add a user</a>.</p>
+<table>
+    <tr>
+        <th>Id</th>
+        <th>Login</th>
+        <th>Is admin ?</th>
+        <th>Edit</th>
+        <th>Delete</th>
+    </tr>
+    <?php $counter1=-1; if( isset($users) && is_array($users) && sizeof($users) ) foreach( $users as $key1 => $value1 ){ $counter1++; ?>
+
+    <tr>
+        <td><?php echo $value1->getId();?></td>
+        <td><?php echo $value1->getLogin();?></td>
+        <td><?php echo $value1->getAdmin() ? "Yes" : "No";?></td>
+        <td><a href="index.php?do=edit_users&user_id=<?php echo $value1->getId();?>">Edit</a></td>
+        <td><?php if( $value1->getId() != $current_user->getId() ){ ?><a href="index.php?do=delete_user&user_id=<?php echo $value1->getId();?>">Delete</a><?php } ?></td>
+    </tr>
+    <?php } ?>
+
+</table>
+<?php }elseif( $view == 'edit_user' ){ ?>
+
+<h2>Edit a user</h2>
+<form method="post" action="index.php?do=add_user" id="edit_user_form">
+    <p>
+    <label for="login" class="label-block">Login : </label><input type="text" name="login" id="login" <?php if( $login_post != '' ){ ?> value="<?php echo $login_post;?>" <?php }else{ ?> <?php echo $user_id != -1 ? 'value="'.$user_data->getLogin().'"' : '';?> <?php } ?>/>
+    </p>
+    <p>
+        <label for="password" class="label-block">Password : </label><input type="password" name="password" id="password"/>
+        <?php if( $user_id != -1 ){ ?>
+
+            <br/><em>Note :</em> Leave blank this field if you don't want to edit password.
+        <?php } ?>
+
+    </p>
+    <p id="edit_user_admin_rights">
+        Give admin rights to this user ?<br/>
+    <input type="radio" id="admin_yes" value="1" name="admin" <?php if( $admin_post == 1 || ($admin_post == -1 && $user_id != -1 && $user_data->getAdmin()) ){ ?> checked<?php } ?>/><label for="admin_yes">Yes</label><br/>
+    <input type="radio" id="admin_no" value="0" name="admin" <?php if( $admin_post == 0 || ($admin_post == -1 && ($user_id == -1 || !$user_data->getAdmin())) ){ ?> checked<?php } ?>/><label for="admin_no">No</label>
+    </p>
+    <p class="center">
+        <input type="submit" value="<?php echo $user_id != -1 ? 'Edit' : 'Add';?>"/>
+        <?php if( $user_id != -1 ){ ?><input type="hidden" name="user_id" value="<?php echo $user_id;?>"/><?php } ?>
+
+    </p>
+</form>
+
+<?php }elseif( $view == 'password' ){ ?>
+
+<h2>Edit your password</h2>
+<form method="post" action="index.php?do=password" id="edit_password_form">
+    <p><label for="password" class="label-block">New password : </label><input type="password" id="password" name="password"/></p>
+    <p><label for="password_confirm" class="label-block">Confirm new password : </label><input type="password" id="password_confirm" name="password_confirm"/></p>
+    <p class="center"><input type="submit" value="Update"/></p>
+</form>
+<?php } ?>
+
diff --git a/tmp/footer.36ba0f7e771a8681573a91518b54b424.rtpl.php b/tmp/footer.36ba0f7e771a8681573a91518b54b424.rtpl.php
new file mode 100644
index 0000000..8a1b51c
--- /dev/null
+++ b/tmp/footer.36ba0f7e771a8681573a91518b54b424.rtpl.php
@@ -0,0 +1,2 @@
+<?php if(!class_exists('raintpl')){exit;}?>    </body>
+</html>
diff --git a/tmp/settings.af3906cfde643ae7f290cfdc51cc9342.rtpl.php b/tmp/settings.af3906cfde643ae7f290cfdc51cc9342.rtpl.php
new file mode 100644
index 0000000..c617c6a
--- /dev/null
+++ b/tmp/settings.af3906cfde643ae7f290cfdc51cc9342.rtpl.php
@@ -0,0 +1,55 @@
+<?php if(!class_exists('raintpl')){exit;}?><?php $tpl = new RainTPL;$tpl_dir_temp = self::$tpl_dir;$tpl->assign( $this->var );$tpl->draw( dirname("header") . ( substr("header",-1,1) != "/" ? "/" : "" ) . basename("header") );?>
+
+
+<?php if( !$show_settings ){ ?>
+
+<h2>Edit homepage notice</h2>
+<form method="post" id="notice_form" action="index.php?do=edit_notice">
+    <p>
+        <label for="textarea_notice">Homepage notice :</label><br/>
+        <textarea name="notice" rows="15" id="textarea_notice"><?php echo $notice;?></textarea>
+    </p>
+    <p><em>Note :</em> You can use HTML formatting in this form.</p>
+    <input type="submit" value="Submit"/>
+</form>
+
+<?php }else{ ?>
+
+
+<h2>Change settings of your Bouffe@Ulm installation</h2>
+<form method="post" action="index.php?do=settings" id="settings_form">
+    <fieldset>
+        <legend>Database</legend>
+        <p><em>Note :</em> Use these settings carefully. Your database won't be updated by the script as it was during install and you'll have to manually update it.</p>
+        <p><label for="mysql_host">MySQL host : </label><input type="text" name="mysql_host" id="mysql_host" value="<?php echo $mysql_host;?>"/></p>
+
+        <p><label for="mysql_login">MySQL login : </label><input type="text" name="mysql_login" id="mysql_login" value="<?php echo $mysql_login;?>"/></p>
+        <p>
+            <label for="mysql_password">MySQL password : </label><input type="password" name="mysql_password" id="mysql_password"/><br/>
+            <em>Note :</em> Leave the above field blank if you don't want to change your password.
+        </p>
+        <p>
+            <label for="mysql_db">Name of the MySQL database to use : </label><input type="text" name="mysql_db" id="mysql_db" value="<?php echo $mysql_db;?>"/><br/>
+            <em>Note :</em> You <em>must</em> create this database first.
+        </p>
+        <p>
+            <label for="mysql_prefix">Prefix for the created tables : </label><input type="text" name="mysql_prefix" id="mysql_prefix" value="<?php echo $mysql_prefix;?>"/><br/>
+            <em>Note :</em> Leave the field blank to not use any.</p>
+    </fieldset>
+    <fieldset>
+        <legend>General options</legend>
+        <p><label for="instance_title">Title to display in pages : </label><input type="text" name="instance_title" id="instance_title" value="<?php echo $instance_title;?>"/></p>
+        <p>
+        <label for="base_url">Base URL : </label><input type="text" size="30" name="base_url" id="base_url" value="<?php echo $base_url;?>"/><br/>
+            <em>Note :</em> This is the base URL from which you access this page. You must keep the trailing "/" in the above address.
+        </p>
+        <p><label for="currency">Currency : </label><input type="text" name="currency" id="currency" size="3" value="<?php echo $currency;?>"/></p>
+    </fieldset>
+    <p class="center"><input type="submit" value="Update settings"></p>
+</form>
+
+<?php } ?>
+
+
+<?php $tpl = new RainTPL;$tpl_dir_temp = self::$tpl_dir;$tpl->assign( $this->var );$tpl->draw( dirname("footer") . ( substr("footer",-1,1) != "/" ? "/" : "" ) . basename("footer") );?>
+