edits to header
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/ftpquota
	public_html/htaccess
Merge branch 'master' of https://github.com/kongweihan/song-about-fm