edit 404 page
separate title of each page & add menu in wp
fix address
Merge remote-tracking branch 'origin/master'

Conflicts:
	404.php