styles.php

i have saved both  my file and the one on the NECN GitHub if this merge
crashes
header.php

I have saved both my version and the NECN Git Hub version locally
styles.css

I have saved both versions locally before this commit to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php
	style.css