Margin fix.
Merge branch 'master' of github.com:filipstachura/memelon

Conflicts:
	client/views/memes/meme_item/meme_item.html