Merge branch 'testing2' into 'master'

added ressursovervåkning

See merge request surya/devops-workshop!9

src/main/webapp/app.html

@@ -17,7 +17,7 @@
             </div>
             <div class="menu">
                 <ul>
-                    <li><a href="http://129.241.96.101:61208/">Ressursovervåking </a></li>
+                    <li><a href="http://129.241.96.52:61208/">Ressursovervåking </a></li>
                     <li><a href="#">Logg</a></li>
                     <li><a href="./settings.html">Innstillinger</a></li>
                     <li><a href="/">Logg ut</a></li>