added giphy api functionality
fixed merge