first merge lori & Gabrielle branches
fixed merge conflicts
practice merge with minor scss change
fix merge conflict
fix merge conflict