Does some work on the controller
Merge branch 'master' of https://github.com/joalon/Labb5.git