Merge branch 'apichange' of github.com:m0ep/master-thesis into apichange
Socc kapitel konfiguration