added a sample font for the theme also fixed some git conflicts
Merge branch 'master' of github.com:panarican/wordpress-boilerplate

Conflicts:
	assets/js/libs/sc-player.js
	header.php