Moreno draft
Merge branch 'master' into moreno
Merge branch 'moreno'
Added gifs to possible image formats
Moreno draft corrections and images