Changed CNAME to github.brianm.me
Merge remote-tracking branch 'origin/master'

Conflicts:
	CNAME
Change URLs to reflect new site URL of this site and Angular site