Category Page
Merge branch 'master' of https://github.com/hcmedia/Susi-Blog

Conflicts:
	wp-content/themes/susi/assets/css/custom.css