CHangement taile screen
Merge branch 'master' of https://github.com/FlorentinMonteil/nils-halden