Merge branch 'image' of github.com:Avans/Security-Workshop into image

Conflicts:
	build-vm/boot.sh

build-vm/boot.sh

@@ -14,8 +14,9 @@ a2dissite 000-default
 a2ensite security-workshop
 service apache2 reload
 
-# Update permissions
+# Prepare image site
 chmod o+w image/uploads
+echo "TODO: Fix AE-35 Unit" > /etc/geheim.txt
 
 # Update database
 echo "Resetting database"

nieuws/admincheck.js

@@ -2,5 +2,5 @@ var page = require('webpage').create();
 page.open('http://localhost/nieuws/login.php', 'post', 'gebruikersnaam=Admin&wachtwoord=sesame', function() {
     setTimeout(function(){
         phantom.exit();
-    }, 1000);
+    }, 3000);
-});
+});