controls menu og hover i menu
merge conflict fix
merge conflict
Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble