tillagt i controllern- martin
ÄNDRING I CONTR
Merge branch 'master' of https://github.com/JoelPennegard/sysa14affairs
martin ändr contr