update
Merge branch 'master' of https://github.com/gnayar33/meme-database

Conflicts:
	ReadMe.md
	fetchproffeed.php
	image.php
	memedb.php
	newLike.php
	profile.php