Adjust line-spacing and fix halo effect on hero
Merge branch 'master' of https://github.com/baBymAngo/catnap

Conflicts:
	assets/styles/styles.css
Update Codekit config