ändring av kl martin
martins
Merge branch 'master' of https://github.com/JoelPennegard/sysa14affairs
martins controller