early html skeleton and css
first merge lori & Gabrielle branches
fixed merge conflicts