custom styles
Merge branch 'master' of https://github.com/monadnockMedia/mm_wp_theme

Conflicts:
	style.css