commit to merge Gabrielle branch
Minor update
fix merge conflict
minor changes
fixes minor merge conflict
Gabrielle section almost complete minus big image hover state