escape gabi branch
fixed merge conflict
commit before pulling lori
fix minor merge conflict in README
mistake ignore
Practice merge w/ minor SCSS changes
fix merge conflict
fix merge conflict
fixed merge conflict
adds a clear floats under  lori's html
Merge branch 'lori' into Gabrielle
adds Gabrielle's section styles