menu bubbles addded
fix conflict
Merge pull request #46 from sunnyLA4/master

menu bubbles addded