changed headings to inherit the font stack from the body since it is identical
version bump to 2.2.5
Some fixes
Merge branch 'master' of https://github.com/brandonb927/cardinal

Conflicts:
	CHANGELOG.md