Changes in world and worldview
Merge branch 'master' of https://github.com/kvillert/Grupp1