Create index.html
Create CNAME
Delete CNAME
Merge branch 'gh-pages'

Conflicts:
	index.html
ignore sublime stuff
started jekyll design
Merge branch 'master' into gh-pages