solve conflict :P
Merge branch 'master' of https://github.com/charliekuldip/000255_Gamut-Cox_Website

Conflicts:
	wp-content/themes/bones/library/css/style.css
	wp-content/themes/bones/page.php