new changes to page master library
fixed css to file style.css
Merge branch 'master-library'

Conflicts:
	style.css
added new css to page home
Merge remote branch 'origin/master'

Conflicts:
	page-templates/page-masters.php
	style.css
fixed conflict file