fix merges
Merge branch 'master' of https://github.com/AngelaDiaFazio/UX-Final into typography
add title
Merge pull request #25 from AngelaDiaFazio/typography

Add title