Obligatorisk 3.1
Toms version, virker ikke helt endnu
Merge branch 'master' of https://github.com/Jelb/BOSC