Merge branch 'master' of https://github.com/haind6442/first

Conflicts:
	header.php