Added gifs
fixed merge conflicts