New design
Merge branch 'master' of github.com:balkian/balkian.github.com

Conflicts:
	CNAME