added bubble and removed god dam buttons!!!!!
Merge remote-tracking branch 'origin/master'