added nav bar
merge conflict
Added styling
Merge pull request #31 from margaretgodowns/margaretH1

Margaret h1
Merge pull request #30 from ansleyjones/ansleysass

Ansleysass
added ids to calendar