fixed up sty;es
stuffffff
Merge branch 'master' of https://github.com/brandfeverinc/wpgithub

Conflicts:
	wp-content/themes/_s/style.css
Merge branch 'master' of https://github.com/brandfeverinc/wpgithub