temporarily serving random gifs from the root. doing this until I think of something better to use the root for
Merge remote-tracking branch 'origin/master'