edition of feed to include the scroll up btn
uploading pics works just fine
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/db-connect.php