Merge branch 'master' of github.com:FinalsClub/karmaworld

diff --cc karmaworld/assets/css/global.css
Simple merge

diff --cc karmaworld/templates/courses/course_list.html
Simple merge

diff --cc karmaworld/templates/partial/add_note.html
index f9a2ecdc7baddcbca13f8fedf78ec26e1be6b242,202297afb39f60ac1c8f7ca5084c370793e1fee3..86d182c09b72351d6c40ab63602aa73563e020b4
--- 1/karmaworld/templates/partial/add_note.html
--- 2/karmaworld/templates/partial/add_note.html
+++ b/karmaworld/templates/partial/add_note.html
@@@ -5,12 -5,11 +5,12 @@@
      //var csrf_token = "{{ csrf_token }}";
    </script>
  
-   <div id=file-uploader style="display:none"></div>
+ 
    <form id=add-note method="POST">
      {% csrf_token %}
 +
      <div class="row">
-       <div class="four columns offset-by-one">
+       <div class="four columns offset-by-one upload-status" style="display:none">
          <legend><span id=add-note-status>Uploading</span> <span id=filename>note</span>...</legend>
          <div class=progress> <div id="progress-fill"></div> </div>
        </div>