Merge pull request #16 from leohemsted/master

fixed giphy
fixed 500s on giphy