conlift
Merge branch 'view' of https://github.com/Bergmam/DAT255 into view