minor
conflict
some font sizes
Merge pull request #53 from saulelis/hp

Hp