Test commit, fucked up version.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens
Successful merge! Tott collision is working!

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Merge branch 'jens' of github.com:rodstrom/yomibubble into olof