add go back button
fix conflict
fix merges
Merge pull request #20 from AngelaDiaFazio/typography

Typography - fix merges