Fix image size in meme creation page.
Merge branch 'master' of github.com:filipstachura/memelon

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