fixed bug, added conditional rendering
Merge branch 'master' of github.com:pato/bubbledone