Merge branch 'adding-pictures-branch'