Masthead Change
Favicon
CName
Merge remote-tracking branch 'amstars/master'

Conflicts:
	source/CNAME