Merge branch 'master' of https://github.com/nloreti/memeCrack

Conflicts:
	meme.php
Merge branch 'master' of https://github.com/nloreti/memeCrack