Merge branch 'master' into kevin-prototype

2017-01-25 15:08:34 +01:00
parent 9ff256429d c23b8bd8e5
commit 95570c49d4
21 changed files with 253 additions and 54 deletions
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -5,6 +5,7 @@
        <div class="friend-button-container">

        </div>
+        
        <h1 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?></h1>
        <h5 class="profile-username"><?=$user["username"]?></h5>
        <p><?=$user["bio"]?></p>