css updates
Nav1 & 2 updates
Merge branch 'lori' into Gabrielle
final commit