First commit
added index.html
Added blog cname entry
Put CNAME in proper place
Merge branch 'master' of github.com:madis/madis.github.com

Conflicts:
	index.html