Merge pull request #16 from AngelaDiaFazio/master

k
Merge pull request #17 from AngelaDiaFazio/paragraphs

Merge pull request #16 from AngelaDiaFazio/master
Merge branch 'master' of https://github.com/AngelaDiaFazio/UX-Final into paragraph
update styling and add code to fonts
fix merge
Merge pull request #18 from AngelaDiaFazio/typography

update styling and add code to fonts
paragraph
paragraph edit
fixed indentation issue in lists.jade
Merge branch 'master' of https://github.com/AngelaDiaFazio/UX-Final
Merge branch 'master' of https://github.com/AngelaDiaFazio/UX-Final into paragraph
Update inline.jade
fixed breaks in inline.jade
Merge branch 'master' of https://github.com/AngelaDiaFazio/UX-Final into paragraph
color
grr
grr
add go back button
Merge pull request #19 from AngelaDiaFazio/color

Color
fix conflict