meme_data.js is now memes.ini
php now loads memes from memes.ini
Merge remote-tracking branch 'upstream/master'
paragraphs can not contain block elements