resolved conflict

1 files changed, 6 insertions, 2 deletions

diff --git a/assets/js/script.js b/assets/js/script.js
index f08ca7a..5531c1e 100644
--- a/assets/js/script.js
+++ b/assets/js/script.js
@@ -6,7 +6,8 @@ function main(){
         $("#profile-follows"),
         $("#profile-friends"),
         $("#profile-inbox"),
-        $("#profile-comments")];
+        $("#profile-comments"),
+        $('#profile-send-message')];
 
     function hidePages(){
         items.forEach(function(item){
@@ -32,7 +33,7 @@ function main(){
                 console.log("clicked general");
                 $("#profile-general").show();
                 break;
-            case "Follows":
+            case "Following":
                 $("#profile-follows").show();
                 break;
             case "Friends":
@@ -44,6 +45,9 @@ function main(){
             case "Comments":
                 $("#profile-comments").show();
                 break;
+            case "Send Message":
+                $('#profile-send-message').show();
+                break;
             default:
                 console.log("Error: User page not found");
         }