cx xbfgb
cx xbfgb
Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php
Merge branch 'master' of https://github.com/haind6442/first
cx xbfgb