Merge pull request #18 from AngelaDiaFazio/typography

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

Color
fix conflict
fix merges