Create gh-pages branch via GitHub
Update .gitignore
Update .gitignore
Update CNAME
Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Delete CNAME
Create gh-pages branch via GitHub
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html