diff --git a/control.js b/control.js
new file mode 100644
index 00000000..8c732663
--- /dev/null
+++ b/control.js
@@ -0,0 +1,93 @@
+/**
+TODO:
+-legge til timer når man trykker pause for at når man "unpauser", går den dit den ville vært, hvis videoen ville blitt ferdig, load en ny video men ha den på pause
+-legge til tid når en video ble påbegynt, for at hvis folk joiner midt i en video, hopper den dit
+*/
+
+/**
+
+Fetcher sangen som spilles fra JSON filen
+
+*/
+
+var response = $.ajax({ type: "GET",
+ url: "videos.json",
+ async: false
+}).responseText;
+
+var url = $.parseJSON(response);
+response = url[0];
+
+/**
+
+Legger sangen inn i
en, via swfobject
+
+*/
+var params = { allowScriptAccess: "always"};
+var atts = { id: "myytplayer" };
+swfobject.embedSWF("http://www.youtube.com/v/"+response+"?enablejsapi=1&playerapiid=ytplayer&version=3&controls=1&iv_load_policy=3",
+ "ytapiplayer", "825", "462", "8", null, null, params, atts);
+
+/**
+eventlistener for når playeren endres
+*/
+
+function onytplayerStateChange(newState) {
+ if(newState == 0) //newState = 0 når videoen er ferdig
+ {
+ $.ajax({ //snutt for å kjøre save.php som lagrer til jsonfilen neste sang og denne sangen. Endrer rekkefølge altså.
+ type: "POST",
+ url: "save.php",
+ data: "thisUrl="+response,
+
+ success: function() {
+ console.log("saved");
+ }
+ });
+
+ setTimeout(function(){ //har en timeout for at den skal klare å fetche hva den neste sangen er etter at save.php har endret på ting
+ response = $.ajax({ type: "GET",
+ url: "videos.json",
+ async: false
+ }).responseText;
+ var url = $.parseJSON(response);
+ response = url[0];
+
+ ytplayer.loadVideoById(response);
+ },100);
+ }
+}
+
+function errorHandler(newState) //errorhandler. Fjerner urlen til en "dårlig" video og går til neste
+{
+ $.ajax({
+ type: "POST",
+ url: "delete.php",
+ data: "thisUrl="+response,
+
+ success: function() {
+ console.log("deleted");
+ }
+ });
+
+ setTimeout(function(){
+ response = $.ajax({ type: "GET",
+ url: "videos.json",
+ async: false
+ }).responseText;
+ var url = $.parseJSON(response);
+ response = url[0];
+
+ ytplayer.loadVideoById(response);
+ },100);
+}
+
+function onYouTubePlayerReady(playerId) { //funksjon som kjøres når playeren er klar
+ ytplayer = document.getElementById("myytplayer");
+ ytplayer.addEventListener("onStateChange", "onytplayerStateChange"); //eventlistenere
+ ytplayer.addEventListener("onError", "errorHandler");
+ //ytplayer.seekTo(ytplayer.getDuration()-10);
+ ytplayer.setVolume(100);
+ ytplayer.playVideo();
+ }
+
\ No newline at end of file
diff --git a/delete.php b/delete.php
new file mode 100644
index 00000000..a292f68a
--- /dev/null
+++ b/delete.php
@@ -0,0 +1,20 @@
+
\ No newline at end of file
diff --git a/index.php b/index.php
index 963a3400..0e2ab52b 100644
--- a/index.php
+++ b/index.php
@@ -1,49 +1,33 @@
-
-
-
-
- Zöff
-
-
-
-
-
-
-
-
Zöff
- Zöff
-
-
-
-
- You need Flash player 8+ and JavaScript enabled to view this video.
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Zöff
+
+
+
+
+
+
+
+
Zöff
+ Zöff
+
+
+
+
+ You need Flash player 8+ and JavaScript enabled to view this video :(
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/main.php b/main.php
new file mode 100644
index 00000000..9a142a02
--- /dev/null
+++ b/main.php
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/save.php b/save.php
new file mode 100644
index 00000000..84f36603
--- /dev/null
+++ b/save.php
@@ -0,0 +1,21 @@
+
\ No newline at end of file
diff --git a/static/style.css b/static/style.css
index a35a2d62..5fee5808 100644
--- a/static/style.css
+++ b/static/style.css
@@ -1,15 +1,16 @@
-body{background:#444; overflow: hidden;}
-.top, .top a {
- font-family: 'Open Sans', sans-serif; font-weight: 600; text-align: center;
- animation: fadein .5s; -moz-animation: fadein .5s; -webkit-animation: fadein .5s; -o-animation: fadein .5s;
-}
-.top div{color:#ed207f;}
-.vcent{position: relative; top: 50%; transform: translateY(-50%);}
-.face{line-height: 1; font-size: 29vw; word-spacing: 60px; margin-top: -7%;}
-.innbox, .innbox a{width:80%; height: 50px; font-family: 'Open Sans', sans-serif; font-size: 25px; color:#f15; text-align: center;}
-.small, .small a{font-size: 5vw; color:#E2E2E2; display:block !important; text-decoration: none;}
-.small a:hover{color:#ed207f;}
-.daform{margin-bottom: 20px;}
-.big{font-size:180vh; position:absolute; top:-100%; color:#000 !important; z-index:-1;}
-
+body{background:#444; overflow: hidden;}
+.top, .top a {
+ font-family: 'Open Sans', sans-serif; font-weight: 600; text-align: center;
+ animation: fadein .5s; -moz-animation: fadein .5s; -webkit-animation: fadein .5s; -o-animation: fadein .5s;
+}
+.top div{color:#ed207f;}
+.vcent{position: relative; top: 50%; transform: translateY(-50%);}
+.face{line-height: 1; font-size: 29vw; word-spacing: 60px; margin-top: -7%;}
+.innbox, .innbox a{width:80%; height: 50px; font-family: 'Open Sans', sans-serif; font-size: 25px; color:#f15; text-align: center;}
+.small, .small a{font-size: 5vw; color:#E2E2E2; display:block !important; text-decoration: none;}
+.small a:hover{color:#ed207f;}
+.daform{margin-bottom: 20px;}
+.big{font-size:180vh; position:absolute; top:-100%; color:#000 !important; z-index:-1;}
+.noselect{-webkit-touch-callout: none;-webkit-user-select: none;-khtml-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;}
+
@-webkit-keyframes fadein{from {opacity:0;}to{opacity:1;}}@keyframes fadein{from{opacity:0;}to{opacity:1;}}@-moz-keyframes fadein{from{opacity:0;}to{opacity:1;}}@-o-keyframes fadein{from{opacity:0;}to{opacity:1;}}
\ No newline at end of file
diff --git a/static/swfobject.js b/static/swfobject.js
index 8eafe9dd..b17981f1 100644
--- a/static/swfobject.js
+++ b/static/swfobject.js
@@ -1,4 +1,4 @@
-/* SWFObject v2.2
- is released under the MIT License
-*/
+/* SWFObject v2.2
+ is released under the MIT License
+*/
var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab