Merge branch 'master' of https://github.com/kennidenni/INF219

Author: Kenneth Apeland

Heap/js/View.js

@@ -348,7 +348,7 @@ var View = /** @class */ (function () {
             this.playing = false;
             manager.pause();
             $("#play").text("Resume");
-            lockPlay(true);
+            lockPlay(false);
             lockBackForward(false);
         }
         else {

Heap/js/View.ts

@@ -403,7 +403,7 @@ class View {
             this.playing = false;
             manager.pause();
             $("#play").text("Resume");
-            lockPlay(true);
+            lockPlay(false);            
             lockBackForward(false);
         } else {
             this.playing = true;