added pictures
updated pages
added quotes
fix merge conflicts
Merge branch 'sabrina'