Check in number one
Second commit
Martins testcommit 3
Third commit
Merge branch 'master' of https://github.com/Marfyy/SysDev-InlUppg1