merging files

Merge branch 'master' of github.com:tawfiqmp/EmoBot
accepteed
Merge branch 'master' of github.com:tawfiqmp/EmoBot
updated
changes to soundcloud
ok...gotchaMerge branch 'master' of github.com:tawfiqmp/EmoBot
updating giphy
trying again
some changes that need to be unchanged
okMerge branch 'master' of github.com:tawfiqmp/EmoBot
whatever
changes
merged
blah blah blah
ok
Merge branch 'master' of github.com:tawfiqmp/EmoBot
got random gifs to work
trying to pull
gif in right spot
updating
righto
whatever
fixinf merge