Second commit
Merge branch 'master' of github.com:Toreheimann/unisport-tore