Katenelson - #1

Open

knelson7 wants to merge 5 commits into

yipstanley:masterfrom

knelson7:katenelson

Commits on Sep 2, 2020

added style.css and linked from index.html
yipstanley
committed
1946117
trying to make a merge conflict
yipstanley
committed
7974824

Commits on Sep 15, 2020

testing out git commit with new changes: added bulleted list.
Kate Nelson
committed
869f036
fixing merge
Kate Nelson
committed
327f6e0
css changes
Kate Nelson
committed
0670b21