Edited typography
Merge branch 'master' of https://github.com/baBymAngo/catnap

Conflicts:
	assets/styles/_static-elements.scss
	assets/styles/styles.css