corretto aspetto last
Merge branch 'master' of github.com:oomushi/baka into emoji

Conflicts:
	app/views/messages/index.html.erb