fix spacing
refactor typewriter sass
merging