Merge branch 'master' of https://github.com/Avans/Security-Quiz

Conflicts:
	templates/base.html

templates/base.html

@@ -40,7 +40,7 @@
           </select>
 
           <a href="/logout" class="btn">Uitloggen</a>
-          {% if CLOSED %}<br>Inzendingen kunnen niet meer worden ingezonden{% else %}<button class="btn-primary btn-disabled" type="submit" id="save-button">Opslaan</button>{% endif %}
+          {% if CLOSED %}<br>Inzendingen kunnen niet meer worden ingezonden{% else %}<button class="btn-primary btn-disabled" type="submit" id="save-button">Opslaan</button><img src="/static/img/loader.gif" id="busy" style="display: none">{% endif %}
           <div class="alert alert-info" id="js-message" style="display: none;"></div>
           <p>Deadline: donderdag 16 juni 23:59</p>
         </div>