bubble style
Merge branch 'master' of https://github.com/jibri/message_me

Conflicts:
	message_me/public/stylesheets/style.css
	message_me/views/conv/messages.jade