Småfix
Merge branch 'iteration3' of https://github.com/Raful/Hoverboard into iteration3