last minute changes
Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble