* type face
* del reset
* add reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/style.min.css
* text