Generate Source
Create CNAME
Update CNAME
Update CNAME
Update CNAME
octopress
remove
octopress
Merge branch 'source' of https://github.com/Folade/folade.github.io into source

Conflicts:
	CNAME
	Rakefile
	_config.yml